Explorar el Código

Merge pull request #1936 from nextcloud/preventAccountNPE

Prevent account NPE
Tobias Kaminsky hace 7 años
padre
commit
11c9fa53a4
Se han modificado 1 ficheros con 5 adiciones y 0 borrados
  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,
                                              String defaultValue) {
         Account account = AccountUtils.getCurrentOwnCloudAccount(context);
+
+        if (account == null) {
+            return defaultValue;
+        }
+        
         ArbitraryDataProvider dataProvider = new ArbitraryDataProvider(context.getContentResolver());
         FileDataStorageManager storageManager = ((ComponentsGetter)context).getStorageManager();
         String value = dataProvider.getValue(account.name, getKeyFromFolder(preferenceName, folder));