Projects >> countdown-android >>df9f8f26dacaee4a5ddd6b97ade1c131220049c1

Chunk
Conflicting content 
        super.onCreate(savedInstanceState);
        setContentView(R.layout.stops);
        
<<<<<<< HEAD
        favouriteStopsDAO = FavouriteStopsDAO.get(getApplicationContext());
		messageService = new MessageService(ApiFactory.getApi(getApplicationContext()), new SeenMessagesDAO(getApplicationContext()));

        fetchMessagesTasks = new ArrayList();
=======
        favouriteStopsDAO = FavouriteStopsDAO.get(this.getApplicationContext());
		messageService = new MessageService(ApiFactory.getApi(), new SeenMessagesDAO(getApplicationContext()));
>>>>>>> f4472bd187b86bc40d7613aaee7acc58d4912a6e
        
        status = (TextView) findViewById(R.id.status);
        status.setVisibility(View.GONE);
Solution content 
        super.onCreate(savedInstanceState);
        setContentView(R.layout.stops);
        
        favouriteStopsDAO = FavouriteStopsDAO.get(getApplicationContext());
		messageService = new MessageService(ApiFactory.getApi(getApplicationContext()), new SeenMessagesDAO(getApplicationContext()));

        status = (TextView) findViewById(R.id.status);
        status.setVisibility(View.GONE);
File
AlertsActivity.java
Developer's decision
Combination
Kind of conflict
Attribute
Method invocation
Chunk
Conflicting content 
import java.util.List;

<<<<<<< HEAD
import org.json.JSONException;

=======
import uk.co.eelpieconsulting.buses.client.BusesClient;
>>>>>>> f4472bd187b86bc40d7613aaee7acc58d4912a6e
import uk.co.eelpieconsulting.buses.client.exceptions.HttpFetchException;
import uk.co.eelpieconsulting.buses.client.exceptions.ParsingException;
import uk.co.eelpieconsulting.busroutes.model.Route;
Solution content 
import java.util.List;

import uk.co.eelpieconsulting.buses.client.exceptions.HttpFetchException;
import uk.co.eelpieconsulting.buses.client.exceptions.ParsingException;
import uk.co.eelpieconsulting.busroutes.model.Route;
File
NearbyRoutesListActivity.java
Developer's decision
None
Kind of conflict
Import
Chunk
Conflicting content 
		// TODO Auto-generated method stub		
	}
	
<<<<<<< HEAD
	private void listNearbyStops(Location location) {		
		status.setText(getString(R.string.searching_for_stops_near) + ": " + DistanceMeasuringService.makeLocationDescription(location));
		status.setVisibility(View.VISIBLE);
				
		fetchNearbyStopsTask = new FetchNearbyStopsTask(ApiFactory.getApi(getApplicationContext()));
=======
	private void listNearbyStops(Location location) {
		if (!location.getProvider().equals(KNOWN_STOP_LOCATION)) {
			status.setText(getString(R.string.stops_near) + " " + DistanceMeasuringService.makeLocationDescription(location));
			status.setVisibility(View.VISIBLE);
		}
		fetchNearbyStopsTask = new FetchNearbyStopsTask(ApiFactory.getApi());
>>>>>>> f4472bd187b86bc40d7613aaee7acc58d4912a6e
		fetchNearbyStopsTask.execute(location);		
		return;		
	}
Solution content 
		// TODO Auto-generated method stub		
	}
	
	private void listNearbyStops(Location location) {		
		status.setText(getString(R.string.searching_for_stops_near) + ": " + DistanceMeasuringService.makeLocationDescription(location));
		status.setVisibility(View.VISIBLE);
				
		fetchNearbyStopsTask = new FetchNearbyStopsTask(ApiFactory.getApi(getApplicationContext()));
		fetchNearbyStopsTask.execute(location);		
		return;		
	}
File
NearbyStopsListActivity.java
Developer's decision
Version 1
Kind of conflict
Attribute
If statement
Method invocation
Method signature
Chunk
Conflicting content 
		final MessageService messageService = new MessageService(ApiFactory.getApi(), new SeenMessagesDAO(context));
		final FavouriteStopsDAO favouriteStopsDAO = FavouriteStopsDAO.get(context);
		final Set favouriteStops = favouriteStopsDAO.getFavouriteStops();
<<<<<<< HEAD
		if (!favouriteStops.isEmpty()) {
			final int[] stopIds = getIdsFrom(favouriteStops);			
			final MessageService messageService = new MessageService(ApiFactory.getApi(context), new SeenMessagesDAO(context));
			
			final List newMessages = messageService.getNewMessagesFor(stopIds);
			if (!newMessages.isEmpty()) {
				sendNotification(context, newMessages);
			} else {
				Log.i(TAG, "No new messages seen; not notifying");
			}
		}
	
=======
		
		fetchUnreadMessagesTask = new FetchUnreadMessagesTask(messageService, context);
		fetchUnreadMessagesTask.execute(favouriteStops);
		
>>>>>>> f4472bd187b86bc40d7613aaee7acc58d4912a6e
		AlertCheckerAlarmSetter alarmSetter = new AlertCheckerAlarmSetter();
		alarmSetter.setSyncAlarm(context);
	}
Solution content 
		final FavouriteStopsDAO favouriteStopsDAO = FavouriteStopsDAO.get(context);
		final Set favouriteStops = favouriteStopsDAO.getFavouriteStops();
		
		fetchUnreadMessagesTask = new FetchUnreadMessagesTask(messageService, context);
		fetchUnreadMessagesTask.execute(favouriteStops);
		
		AlertCheckerAlarmSetter alarmSetter = new AlertCheckerAlarmSetter();
		alarmSetter.setSyncAlarm(context);
	}
File
AlertCheckerAlarmReceiver.java
Developer's decision
Version 2
Kind of conflict
Attribute
If statement
Method invocation