mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-26 23:28:42 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2072 from tilosp/prioritize-screenshots

Browse source 
Auto upload: Prioritize Screenshots Folder
This commit is contained in:
Tobias Kaminsky 2018-01-31 14:56:05 +01:00 committed by GitHub
commit bbd57d4f10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/main/java/com/owncloud/android/ui/activity/SyncedFoldersActivity.java
View file

@ -87,7 +87,7 @@ public class SyncedFoldersActivity extends FileActivity implements SyncedFolderA
SyncedFolderPreferencesDialogFragment.OnSyncedFolderPreferenceListener {
private static final String SYNCED_FOLDER_PREFERENCES_DIALOG_TAG = "SYNCED_FOLDER_PREFERENCES_DIALOG";
public static final String PRIORITIZED_FOLDER = "Camera";
public static final String[] PRIORITIZED_FOLDERS = new String[] { "Camera", "Screenshots" };
public static final String EXTRA_SHOW_SIDEBAR = "SHOW_SIDEBAR";
private static final String SCREEN_NAME = "Auto upload";
@ -293,17 +293,19 @@ public class SyncedFoldersActivity extends FileActivity implements SyncedFolderA
return -1;
} else if (f2.getFolderName() == null) {
return 1;
} else if (PRIORITIZED_FOLDER.equals(f1.getFolderName()) &&
PRIORITIZED_FOLDER.equals(f2.getFolderName())) {
return 0;
} else if (PRIORITIZED_FOLDER.equals(f1.getFolderName())) {
return -1;
} else if (PRIORITIZED_FOLDER.equals(f2.getFolderName())) {
return 1;
} else {
return f1.getFolderName().toLowerCase(Locale.getDefault()).compareTo(
f2.getFolderName().toLowerCase(Locale.getDefault()));
}
for (String folder : PRIORITIZED_FOLDERS) {
if (folder.equals(f1.getFolderName()) &&
folder.equals(f2.getFolderName())) {
return 0;
} else if (folder.equals(f1.getFolderName())) {
return -1;
} else if (folder.equals(f2.getFolderName())) {
return 1;
}
}
return f1.getFolderName().toLowerCase(Locale.getDefault()).compareTo(
f2.getFolderName().toLowerCase(Locale.getDefault()));
}
});