Fix bug #401 and bump version and changelog

AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.matburt.mobileorg"
-    android:versionCode="910"
-    android:versionName="0.9.10" >
+    android:versionCode="912"
+    android:versionName="0.9.12" >
 
     <uses-sdk
         android:minSdkVersion="8"
@@ -178,7 +178,7 @@
             <intent-filter>
 
                 <!-- Change this to be db- followed by your app key -->
-                <data android:scheme="db-2y6mph4a6httm78" />
+                <data android:scheme="db-et6v9bbqd4pu0ak" />
 
                 <action android:name="android.intent.action.VIEW" />
 

res/raw/upgrade.txt

@@ -1,5 +1,8 @@
 MobileOrg Upgrade Notes
 
+Changes for 0.9.11 & 12:
+- Fix bugs and crashes that crept into the .10 release
+
 Changes for 0.9.10:
 - Support for BUSY/AVAILABLE
 - Clean up Settings activity

res/xml/preferences.xml

@@ -186,7 +186,7 @@
     <PreferenceCategory android:title="@string/preference_other" >
         <PreferenceScreen
             android:key="VersionDisp"
-            android:summary="0.9.10"
+            android:summary="0.9.12"
             android:title="@string/preference_version" >
         </PreferenceScreen>
     </PreferenceCategory>

src/com/matburt/mobileorg/Gui/Capture/EditActivity.java

@@ -49,7 +49,7 @@ protected void onDestroy() {
 	public boolean onCreateOptionsMenu(Menu menu) {
 		getSupportMenuInflater().inflate(R.menu.edit, menu);
 
-		if(controller.isNodeEditable() == false)
+		if(controller != null && controller.isNodeEditable() == false)
 			menu.findItem(R.id.nodeedit_save).setVisible(false);
 
     	return super.onCreateOptionsMenu(menu);