Projects >> cmov2_client >>92cdc2c455340d7878df48283e599f1574e3b23b

Chunk
Conflicting content 
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
import android.os.Bundle;
<<<<<<< HEAD
import android.view.Menu;
import android.view.MenuItem;
=======
import android.util.Log;
>>>>>>> 352936089fe93d066d9deb7c580be25c137697f8
import android.widget.GridView;

import com.google.android.c2dm.C2DMessaging;
Solution content 
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
import android.os.Bundle;
import android.view.Menu;
import android.view.MenuItem;
import android.util.Log;
import android.widget.GridView;

import com.google.android.c2dm.C2DMessaging;
File
PropertyMarketActivity.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
	            @Override
	            public boolean onLongClick(View v) {
<<<<<<< HEAD
	            	Display.dialogBuildDeleteDiscard(getItemId(position),mContext);
=======
	            	new AlertDialog.Builder(mContext)
					.setTitle(pt.up.fe.cmov.propertymarket.R.string.discard_property_title)
					.setMessage(pt.up.fe.cmov.propertymarket.R.string.discard_property_desc)
					.setCancelable(true)
					.setIcon(android.R.drawable.ic_menu_delete)
					.setPositiveButton(pt.up.fe.cmov.propertymarket.R.string.confirmation,
							new DialogInterface.OnClickListener() {
								public void onClick(DialogInterface dialog, int id) {
									try {
									    SharedPreferences prefs = mContext.getSharedPreferences(PropertyMarketActivity.PREFS_NAME, Context.MODE_PRIVATE);

									    if (!prefs.contains(PropertyMarketActivity.USER_EMAIL)) {
									    	Log.w("PM-Discard", "Client doesn't have an email account. Using default!");
									    }
									    
									    String userEmail = prefs.getString(PropertyMarketActivity.USER_EMAIL, "joao.portela@gmail.com");
									    
										JSONObject obj = new JSONObject("{'user_email': '" + userEmail + "' }");
										
										RailsRestClient.Post("properties/" + getItemId(position) + "/discard", obj);
									}
									catch(Exception e) {
										e.printStackTrace();
									}
									
									((Activity) mContext).finish();
									Intent intent = new Intent(mContext, PropertyMarketActivity.class);
									mContext.startActivity(intent);
								}
							})
					.setNegativeButton(pt.up.fe.cmov.propertymarket.R.string.denial, new DialogInterface.OnClickListener() {
							public void onClick(DialogInterface dialog, int id) {
							dialog.cancel();
							}
					}).show();
	            	
>>>>>>> 352936089fe93d066d9deb7c580be25c137697f8
	                return true;
	            }
	        });
Solution content 
	            @Override
	            public boolean onLongClick(View v) {
	            	Display.dialogBuildDeleteDiscard(getItemId(position),mContext);
	                return true;
	            }
	        });
File
PropertyGridAdapter.java
Developer's decision
Version 1
Kind of conflict
Method invocation
Chunk
Conflicting content 
  @Override
  protected void onMessage(Context context, Intent intent) {
	  mManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
<<<<<<< HEAD
	  Notification notification = new Notification(R.drawable.icon,intent.getStringExtra(this.getString(R.string.name)), System.currentTimeMillis());
	  notification.setLatestEventInfo(this,this.getString(R.string.app_name),intent.getStringExtra(this.getString(R.string.message)),
	  PendingIntent.getActivity(this.getBaseContext(), 0, intent,PendingIntent.FLAG_CANCEL_CURRENT));
	  mManager.notify(APP_ID, notification);
	  
    Log.w("Tester", "Message: " + intent.getStringExtra("message"));
    Log.w("Tester", "id: " + intent.getStringExtra("id"));
    Log.w("Tester", "name: " + intent.getStringExtra("name"));
=======
	  
	  int icon = R.drawable.icon;
	  String id = intent.getStringExtra(C2DM_DATA_ID);
	  String type = intent.getStringExtra(C2DM_DATA_TYPE);
	  String name = intent.getStringExtra(C2DM_DATA_NAME);
	  String message = intent.getStringExtra(C2DM_DATA_MESSAGE);

	  if (type.equals("apartment"))
		  icon = R.drawable.apartment_icon;
	  else if (type.equals("castle"))
		  icon = R.drawable.castle_icon;
	  else if (type.equals("home"))
		  icon = R.drawable.home_icon;
	  
	  Notification notification = new Notification(icon,intent.getStringExtra(this.getString(R.string.notification_title)), System.currentTimeMillis());
	  notification.setLatestEventInfo(this,name,message,
			  PendingIntent.getActivity(this.getBaseContext(), 0, intent,PendingIntent.FLAG_CANCEL_CURRENT));
	 
	  mManager.notify(APP_ID, notification);
    
>>>>>>> 352936089fe93d066d9deb7c580be25c137697f8
  }
}
Solution content 
	  
  @Override
  protected void onMessage(Context context, Intent intent) {
	  mManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
	  
	  int icon = R.drawable.icon;
	  String type = intent.getStringExtra(C2DM_DATA_TYPE);
	  String name = intent.getStringExtra(C2DM_DATA_NAME);
	  String message = intent.getStringExtra(C2DM_DATA_MESSAGE);

	  if (type.equals("apartment"))
		  icon = R.drawable.apartment_icon;
	  else if (type.equals("castle"))
		  icon = R.drawable.castle_icon;
	  else if (type.equals("home"))
		  icon = R.drawable.home_icon;
	  Notification notification = new Notification(icon,intent.getStringExtra(this.getString(R.string.notification_title)), System.currentTimeMillis());
	  notification.setLatestEventInfo(this,name,message,
			  PendingIntent.getActivity(this.getBaseContext(), 0, intent,PendingIntent.FLAG_CANCEL_CURRENT));
	 
	  mManager.notify(APP_ID, notification);
  }
}
File
C2DMReceiver.java
Developer's decision
Combination
Kind of conflict
If statement
Method invocation
Variable
Chunk
Conflicting content 
public class RailsRestClient {
	
<<<<<<< HEAD
	public final static String SERVER_URL = "http://192.168.1.2:3000";
=======
	public final static String SERVER_URL = "http://10.0.0.144:3000";
>>>>>>> 352936089fe93d066d9deb7c580be25c137697f8
Solution content 
public class RailsRestClient {
	
	public final static String SERVER_URL = "http://192.168.1.2:3000";
File
RailsRestClient.java
Developer's decision
None
Kind of conflict
Attribute