Merge lp:~cmiller/ubuntuone-android-contacts/resume-null-pointer-bug626849 into lp:ubuntuone-android-contacts

[Chad Miller]

[Martin Albisetti (beuno)]

review: Approve

=== modified file 'externals/jme-sdk/client/src/com/funambol/client/controller/SynchronizationController.java'
--- externals/jme-sdk/client/src/com/funambol/client/controller/SynchronizationController.java	2010-08-11 14:31:25 +0000
+++ externals/jme-sdk/client/src/com/funambol/client/controller/SynchronizationController.java	2010-09-01 21:30:57 +0000
@@ -829,6 +829,11 @@
     }
 
     protected void setScreen(Screen screen) {
+		if (screen == null) {
+			Log.info(TAG_LOG, "lpbug626849, setScreen(null)");
+		} else {
+			Log.info(TAG_LOG, "lpbug626849, setScreen to non-null");
+		}
         this.screen = screen;
     }
 

=== modified file 'src/com/ubuntuone/android/contacts/funambol/activities/AndroidAccountScreen.java'
--- src/com/ubuntuone/android/contacts/funambol/activities/AndroidAccountScreen.java	2010-08-18 00:39:55 +0000
+++ src/com/ubuntuone/android/contacts/funambol/activities/AndroidAccountScreen.java	2010-09-01 21:30:57 +0000
@@ -116,7 +116,15 @@
     	   aren't any credentials. However, we might be being launched after
     	   the browser callback has launched the HomeScreen. So get the 
     	   HomeScreen's Intent to check. */
-    	Intent i = ((Activity)this.homeScreenController.getHomeScreen()).getIntent();
+
+    	Activity homeScreen = (Activity) this.homeScreenController.getHomeScreen();
+		if (homeScreen == null) {
+			// If there is no home screen set, we can't get a callback.
+			android.util.Log.w(TAG, "lpbug626849, onResume, there is no homeScreen set. This could be a bug.");
+			return;
+		}
+
+    	Intent i = homeScreen.getIntent();
     	if (isBrowserCallback(i)) {
     		handleBrowserCallback(i);
     	}    
@@ -125,15 +133,18 @@
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
 
-        if (keyCode == KeyEvent.KEYCODE_BACK && homeScreenController != null &&
-                homeScreenController.getHomeScreen() != null) {
-            // Close the main screen
-            ((Activity)homeScreenController.getHomeScreen()).finish();
-            finish();
-            return false;
-        } else {
-            return super.onKeyDown(keyCode, event);
+        if (keyCode == KeyEvent.KEYCODE_BACK && homeScreenController != null) {
+			Activity homeScreen = (Activity) this.homeScreenController.getHomeScreen();
+			if (homeScreen == null) {
+				android.util.Log.w(TAG, "lpbug626849, onKeyDown(back), there is no homeScreen set. This could be a bug.");
+			} else {
+            	homeScreen.finish();
+				finish();
+				return false;
+			}
         }
+
+		return super.onKeyDown(keyCode, event);
     }
 
     @Override