Fix #65 NullPointer when trying to savev0.5.2

8 files changed, 14 insertions, 10 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 28b36c53..6bf27833 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "it.niedermann.owncloud.notes"

         minSdkVersion 10

         targetSdkVersion 23

-        versionCode 6

-        versionName "0.5.1"

+        versionCode 7

+        versionName "0.5.2"

     }

     buildTypes {

         release {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 38a2a869..19c2d924 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest
     package="it.niedermann.owncloud.notes"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="5"
-    android:versionName="0.5.0">
+    android:versionCode="7"
+    android:versionName="0.5.2">
 
     <uses-sdk
         android:minSdkVersion="10"
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteServerSyncHelper.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteServerSyncHelper.java
index 2fa8bb44..668ace2f 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteServerSyncHelper.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteServerSyncHelper.java
@@ -169,7 +169,11 @@ public class NoteServerSyncHelper {
 
         @Override
         protected void onPostExecute(Note note) {
-            db.updateNote(note);
+            if (note != null) {
+                // Note has been deleted on server?
+                // Maybe handle with Pop-Up and ask if Note should be local deleted or recreated on server.
+                db.updateNote(note);
+            }
             asyncTaskFinished();
         }
     }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 9e60901a..7a2b5a23 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -61,7 +61,7 @@
     <!-- About -->
 
     <string name="about_version_title">Version</string>
-    <string name="about_version">Sie benutzen aktuell <strong>v0.5.1</strong></string>
+    <string name="about_version">Sie benutzen aktuell <strong>v0.5.2</strong></string>
     <string name="about_maintainer_title">Maintainer</string>
     <string name="about_maintainer"><a href="http://www.niedermann.it/">Niedermann IT-Dienstleistungen</a></string>
     <string name="about_developers_title">Entwickler</string>
diff --git a/app/src/main/res/values-hy/strings.xml b/app/src/main/res/values-hy/strings.xml
index 434b6ade..2b6e5d64 100644
--- a/app/src/main/res/values-hy/strings.xml
+++ b/app/src/main/res/values-hy/strings.xml
@@ -61,7 +61,7 @@
     <!-- About -->
 
     <string name="about_version_title">տարբերակ</string>
-    <string name="about_version">դուք օգտագործում եք <strong>v0.5.1</strong></string>
+    <string name="about_version">դուք օգտագործում եք <strong>v0.5.2</strong></string>
     <string name="about_maintainer_title">ղեկավար</string>
     <string name="about_maintainer"><a href="http://www.niedermann.it/">Niedermann IT-Dienstleistungen</a></string>
     <string name="about_developers_title">ծրագրավորող</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index ea803d04..465b4e34 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -61,7 +61,7 @@
     <!-- About -->
 
     <string name="about_version_title">версия</string>
-    <string name="about_version">вы сейчас используете <strong>v0.5.1</strong></string>
+    <string name="about_version">вы сейчас используете <strong>v0.5.2</strong></string>
     <string name="about_maintainer_title">руководитель</string>
     <string name="about_maintainer"><a href="http://www.niedermann.it/">Niedermann IT-Dienstleistungen</a></string>
     <string name="about_developers_title">разработчики</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 711abdb8..82eb89db 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -62,7 +62,7 @@
     <!-- About -->
 
     <string name="about_version_title">Издање</string>
-    <string name="about_version">Текуће издање је <strong>0.5.1</strong></string>
+    <string name="about_version">Текуће издање је <strong>0.5.2</strong></string>
     <string name="about_maintainer_title">Главни програмер</string>
     <string name="about_maintainer"><a href="http://www.niedermann.it/">Niedermann IT-Dienstleistungen</a></string>
     <string name="about_developers_title">Програмери</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ca26ea22..9df9f1ec 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -62,7 +62,7 @@
     <!-- About -->
 
     <string name="about_version_title">Version</string>
-    <string name="about_version">You are currently using <strong>v0.5.1</strong></string>
+    <string name="about_version">You are currently using <strong>v0.5.2</strong></string>
     <string name="about_maintainer_title">Maintainer</string>
     <string name="about_maintainer"><a href="http://www.niedermann.it/">Niedermann IT-Dienstleistungen</a></string>
     <string name="about_developers_title">Developers</string>