Merge

App/src/main/java/cc/softwarefactory/lokki/android/activities/MainActivity.java

@@ -375,6 +375,7 @@ private void signUserIn() {
             }
         } else { // User already logged-in
             MainApplication.user.setEmail(PreferenceUtils.getString(this, PreferenceUtils.KEY_USER_ACCOUNT));
+            ((NavigationDrawerFragment) getSupportFragmentManager().findFragmentById(R.id.navigation_drawer)).setUserInfo();
             GcmHelper.start(getApplicationContext()); // Register to GCM
         }
     }

App/src/main/java/cc/softwarefactory/lokki/android/avatar/AvatarLoader.java

@@ -83,17 +83,17 @@ private static boolean cancelPotentialWork(Person person, ImageView imageView) {
 
         BitmapWorkerTask task = getTaskFromView(imageView);
 
-        if (task == null) {
-            Log.e(TAG, "cancelPotentialWork: No task associated with the ImageView, or an existing task was cancelled"); // No task associated with the ImageView, or an existing task was cancelled
+        if (task == null || person == null) {
+            Log.e(TAG, "cancelPotentialWork: No task or person associated with the ImageView, or an existing task was cancelled");
             return true;
         }
 
-        if (!task.data.getEmail().equals(person.getEmail())) {
-            Log.e(TAG, "cancelPotentialWork: Cancel previous task"); // Cancel previous task
+        if (task.data == null || task.data.getEmail() == null || !task.data.getEmail().equals(person.getEmail())) {
+            Log.e(TAG, "cancelPotentialWork: Cancel previous task");
             task.cancel(true);
             return true;
         }
-        Log.e(TAG, "cancelPotentialWork: The same work is already in progress"); // The same work is already in progress
+        Log.e(TAG, "cancelPotentialWork: The same work is already in progress");
         return false;
     }
 

App/src/main/java/cc/softwarefactory/lokki/android/fragments/NavigationDrawerFragment.java

@@ -30,6 +30,7 @@
 import cc.softwarefactory.lokki.android.MainApplication;
 import cc.softwarefactory.lokki.android.R;
 import cc.softwarefactory.lokki.android.avatar.AvatarLoader;
+import cc.softwarefactory.lokki.android.models.MainUser;
 import cc.softwarefactory.lokki.android.utilities.PreferenceUtils;
 
 /**
@@ -107,10 +108,12 @@ public void setUserInfo() {
             ImageView avatarImage = (ImageView) mListViewHeader.findViewById(R.id.avatar);
             AvatarLoader avatarLoader = new AvatarLoader();
 
-            String email = PreferenceUtils.getString(getActivity(), PreferenceUtils.KEY_USER_ACCOUNT);
-            avatarLoader.load(MainApplication.user, avatarImage);
+            MainUser user = MainApplication.user;
+            avatarLoader.load(user, avatarImage);
 
-            aq.id(R.id.user_name).text(email);
+            if (user != null && user.getEmail() != null) {
+                aq.id(R.id.user_name).text(MainApplication.user.getEmail());
+            }
         }
         else {
             Log.e(TAG, "Cannot add user info. ListViewHeader not initialized");

App/src/main/java/cc/softwarefactory/lokki/android/models/Place.java

@@ -1,14 +1,17 @@
 package cc.softwarefactory.lokki.android.models;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
 /**
  * Model Class for Tracking Place on Map
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Place implements Comparable<Place> {
 
-    private String id; // place id
-    private String name; // place name
-    private String img;  // Place image
-    private UserLocation location; // place location
+    private String id;
+    private String name;
+    private String img;
+    private UserLocation location;
 
     public String getId() {
         return id;