From dbb38cccf968ac4c97b643613497457b32cf29df Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Sun, 5 Feb 2017 22:39:24 +0100 Subject: make updater work in Android N fixes #98 --- .../java/de/pixart/messenger/persistance/FileBackend.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'src/main/java/de/pixart/messenger/persistance/FileBackend.java') 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); } } -- cgit v1.2.3