Преглед изворни кода

prevent account NPE

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
tobiasKaminsky пре 7 година
родитељ
комит
213646cb41
1 измењених фајлова са 5 додато и 0 уклоњено
  1. 5 0
      src/main/java/com/owncloud/android/db/PreferenceManager.java

+ 5 - 0
src/main/java/com/owncloud/android/db/PreferenceManager.java

@@ -236,6 +236,11 @@ public abstract class PreferenceManager {
     public static String getFolderPreference(Context context, String preferenceName, OCFile folder,
     public static String getFolderPreference(Context context, String preferenceName, OCFile folder,
                                              String defaultValue) {
                                              String defaultValue) {
         Account account = AccountUtils.getCurrentOwnCloudAccount(context);
         Account account = AccountUtils.getCurrentOwnCloudAccount(context);
+
+        if (account == null) {
+            return defaultValue;
+        }
+        
         ArbitraryDataProvider dataProvider = new ArbitraryDataProvider(context.getContentResolver());
         ArbitraryDataProvider dataProvider = new ArbitraryDataProvider(context.getContentResolver());
         FileDataStorageManager storageManager = ((ComponentsGetter)context).getStorageManager();
         FileDataStorageManager storageManager = ((ComponentsGetter)context).getStorageManager();
         String value = dataProvider.getValue(account.name, getKeyFromFolder(preferenceName, folder));
         String value = dataProvider.getValue(account.name, getKeyFromFolder(preferenceName, folder));