make updater work in Android N

fixes #98

1 files changed, 11 insertions, 3 deletions

diff --git a/src/main/java/de/pixart/messenger/persistance/FileBackend.java b/src/main/java/de/pixart/messenger/persistance/FileBackend.java
index 6ca53b6b4..4ad3d9e39 100644
--- a/src/main/java/de/pixart/messenger/persistance/FileBackend.java
+++ b/src/main/java/de/pixart/messenger/persistance/FileBackend.java
@@ -174,11 +174,19 @@ public class FileBackend {
         return true;
     }
 
+    public static String getDirectoryName(final String type) {
+        if (type == "null" || type == null) {
+            return "/Pix-Art Messenger/";
+        } else {
+            return "/Pix-Art Messenger" + "/" + type + "/";
+        }
+    }
+
     public static String getConversationsDirectory(final String type) {
-        if (type == "null") {
-            return Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pix-Art Messenger/";
+        if (type == "null" || type == null) {
+            return Environment.getExternalStorageDirectory().getAbsolutePath() + getDirectoryName(null);
         } else {
-            return Environment.getExternalStorageDirectory().getAbsolutePath() + "/Pix-Art Messenger" + "/" + type + "/";
+            return Environment.getExternalStorageDirectory().getAbsolutePath() + getDirectoryName(type);
         }
     }