Przeglądaj źródła

Merge pull request #972 from nextcloud/hideContactsBackupFolder

Hide contacts backup folder
Mario Đanić 8 lat temu
rodzic
commit
99114a2c72

+ 2 - 6
src/main/java/com/owncloud/android/ui/adapter/FileListListAdapter.java

@@ -77,7 +77,6 @@ public class FileListListAdapter extends BaseAdapter {
     private Vector<OCFile> mFilesAll = new Vector<OCFile>();
     private Vector<OCFile> mFiles = null;
     private boolean mJustFolders;
-    private boolean mShowHiddenFiles;
 
     private FileDataStorageManager mStorageManager;
     private Account mAccount;
@@ -106,9 +105,6 @@ public class FileListListAdapter extends BaseAdapter {
         FileStorageUtils.mSortOrder = PreferenceManager.getSortOrder(mContext);
         FileStorageUtils.mSortAscending = PreferenceManager.getSortAscending(mContext);
 
-        // Fetch preferences for showing hidden files
-        mShowHiddenFiles = PreferenceManager.showHiddenFilesEnabled(mContext);
-
         // initialise thumbnails cache on background thread
         new ThumbnailsCacheManager.InitDiskCacheTask().execute();
     }
@@ -456,7 +452,7 @@ public class FileListListAdapter extends BaseAdapter {
             if (mJustFolders) {
                 mFiles = getFolders(mFiles);
             }
-            if (!mShowHiddenFiles) {
+            if (!PreferenceManager.showHiddenFilesEnabled(mContext)) {
                 mFiles = filterHiddenFiles(mFiles);
             }
             mFiles = FileStorageUtils.sortOcFolder(mFiles);
@@ -623,7 +619,7 @@ public class FileListListAdapter extends BaseAdapter {
             mFiles = new Vector<>();
             if (ocFiles != null && ocFiles.size() > 0) {
                 mFiles.addAll(ocFiles);
-                if (!mShowHiddenFiles) {
+                if (!PreferenceManager.showHiddenFilesEnabled(mContext)) {
                     mFiles = filterHiddenFiles(mFiles);
                 }
                 mFiles = FileStorageUtils.sortOcFolder(mFiles);

+ 1 - 1
src/main/res/values/setup.xml

@@ -42,7 +42,7 @@
     
     <!-- Contacts backup -->
     <bool name="contacts_backup">true</bool>
-    <string name="contacts_backup_folder">/Contacts-Backup</string>
+    <string name="contacts_backup_folder">/.Contacts-Backup</string>
     <integer name="contacts_backup_expire">-1</integer>
     
     <!-- To fill if you want to show webviews instead of regular welcome views -->

+ 1 - 1
src/modified/res/values/setup.xml

@@ -42,7 +42,7 @@
 
     <!-- Contacts backup -->
     <bool name="contacts_backup">true</bool>
-    <string name="contacts_backup_folder">/Contacts-Backup</string>
+    <string name="contacts_backup_folder">/.Contacts-Backup</string>
     <integer name="contacts_backup_expire">30</integer>
 
     <!-- Colors -->