Skip to content

Commit 9ef33d0

Browse files
committed
wip
Signed-off-by: alperozturk96 <alper_ozturk@proton.me>
1 parent 1e4a6c4 commit 9ef33d0

2 files changed

Lines changed: 17 additions & 2 deletions

File tree

app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -338,6 +338,7 @@ public String[] getPassCode() {
338338
@Override
339339
public String getFolderLayout(FolderLayout layout) {
340340
if (layout instanceof FolderLayout.Child child) {
341+
// keep existing logic for child directories
341342
return getFolderPreference(context,
342343
userAccountManager.getUser(),
343344
layout.getKey(),
@@ -364,6 +365,7 @@ public void setFolderLayout(FolderLayout layout, String layoutName) {
364365
return;
365366
}
366367

368+
// only use new way for root shared, favorite and all files
367369
preferences.edit()
368370
.putString(layout.getPrefKey(userAccountManager.getUser()), layoutName)
369371
.apply();

app/src/main/java/com/owncloud/android/ui/fragment/FolderLayout.kt

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,25 @@ package com.owncloud.android.ui.fragment
1010
import com.nextcloud.client.account.User
1111
import com.owncloud.android.datamodel.OCFile
1212

13+
/**
14+
* AllFiles, Favorites and Shared represents only for root of them
15+
* Child is valid for any child directory of all files, favorites or shared.
16+
*
17+
* Important:
18+
* Do not change key to not lose data.
19+
*/
1320
sealed class FolderLayout(val key: String) {
14-
data object Shared : FolderLayout("shared_folder_layout")
15-
data object Favorites : FolderLayout("favorite_folder_layout")
1621
data object AllFiles : FolderLayout("all_files_folder_layout")
22+
data object Favorites : FolderLayout("favorite_folder_layout")
23+
data object Shared : FolderLayout("shared_folder_layout")
1724
data class Child(val folder: OCFile) : FolderLayout("folder_layout")
1825

26+
/**
27+
* Returns shared pref key only child uses key without user so that we dont lose
28+
* previous information.
29+
*
30+
* User is needed since multiple account can be used.
31+
*/
1932
fun getPrefKey(user: User): String {
2033
if (this is Child) {
2134
return key

0 commit comments

Comments
 (0)