Skip to content

[stable-35.1.x] fix(app-preferences): anr #18014

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alperozturk96 merged 2 commits into from
Nov 11, 2026
Merged

[stable-35.1.x] fix(app-preferences): anr #18014

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5f5974e
fix(app-preferences): anr
alperozturk96 Nov 5, 2026
53b315f
wip
alperozturk96 Nov 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 35 additions & 45 deletions app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
/*
* Nextcloud - Android Client
*
* SPDX-FileCopyrightText: 2026 Alper Ozturk <alper.ozturk@nextcloud.com>
* SPDX-FileCopyrightText: 2023 TSI-mc
* SPDX-FileCopyrightText: 2022 Álvaro Brey <alvaro@alvarobrey.com>
* SPDX-FileCopyrightText: 2019 Tobias Kaminsky <tobias@kaminsky.me>
Expand Down Expand Up @@ -35,6 +36,8 @@
import java.util.List;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;

import androidx.annotation.NonNull;
Expand Down Expand Up @@ -117,9 +120,12 @@ public final class AppPreferencesImpl implements AppPreferences {

private static final String LOG_ENTRY = "log_entry";

private static final ExecutorService arbitraryDataWriter = Executors.newSingleThreadExecutor();

private final Context context;
private final SharedPreferences preferences;
private final UserAccountManager userAccountManager;
private final ArbitraryDataProvider arbitraryDataProvider;
private final ListenerRegistry listeners;

private static final int AUTO_UPLOAD_ON_START_DEBOUNCE_IN_MINUTES = 10;
Expand Down Expand Up @@ -175,13 +181,18 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
public static AppPreferences fromContext(Context context) {
final UserAccountManager userAccountManager = UserAccountManagerImpl.fromContext(context);
final SharedPreferences prefs = android.preference.PreferenceManager.getDefaultSharedPreferences(context);
return new AppPreferencesImpl(context, prefs, userAccountManager);
final ArbitraryDataProvider arbitraryDataProvider = new ArbitraryDataProviderImpl(context);
return new AppPreferencesImpl(context, prefs, userAccountManager, arbitraryDataProvider);
}

AppPreferencesImpl(Context appContext, SharedPreferences preferences, UserAccountManager userAccountManager) {
AppPreferencesImpl(Context appContext,
SharedPreferences preferences,
UserAccountManager userAccountManager,
ArbitraryDataProvider arbitraryDataProvider) {
this.context = appContext;
this.preferences = preferences;
this.userAccountManager = userAccountManager;
this.arbitraryDataProvider = arbitraryDataProvider;
this.listeners = new ListenerRegistry(this);
this.preferences.registerOnSharedPreferenceChangeListener(listeners);
}
Expand Down Expand Up @@ -341,8 +352,7 @@ public String[] getPassCode() {
public String getFolderLayout(FolderLayout layout) {
if (layout instanceof FolderLayout.Child child) {
// keep existing logic for child directories
return getFolderPreference(context,
userAccountManager.getUser(),
return getFolderPreference(userAccountManager.getUser(),
layout.getKey(),
child.getFolder(),
FOLDER_LAYOUT_LIST);
Expand All @@ -359,11 +369,9 @@ public String getFolderLayout(FolderLayout layout) {
@Override
public void setFolderLayout(@NonNull FolderLayout layout, String layoutName) {
if (layout instanceof FolderLayout.Child child) {
setFolderPreference(context,
userAccountManager.getUser(),
child.getKey(),
child.getFolder(),
layoutName);
storeValueInBackground(userAccountManager.getUser().getAccountName(),
getKeyFromFolder(child.getKey(), child.getFolder()),
layoutName);
return;
}

Expand All @@ -375,20 +383,17 @@ public void setFolderLayout(@NonNull FolderLayout layout, String layoutName) {

@Override
public FileSortOrder getSortOrderByFolder(OCFile folder) {
return FileSortOrder.sortOrders.get(getFolderPreference(context,
userAccountManager.getUser(),
return FileSortOrder.sortOrders.get(getFolderPreference(userAccountManager.getUser(),
PREF__FOLDER_SORT_ORDER,
folder,
FileSortOrder.SORT_A_TO_Z.name));
}

@Override
public void setSortOrder(@Nullable OCFile folder, FileSortOrder sortOrder) {
setFolderPreference(context,
userAccountManager.getUser(),
PREF__FOLDER_SORT_ORDER,
folder,
sortOrder.name);
storeValueInBackground(userAccountManager.getUser().getAccountName(),
getKeyFromFolder(PREF__FOLDER_SORT_ORDER, folder),
sortOrder.name);
}

@Override
Expand All @@ -403,18 +408,15 @@ public FileSortOrder getSortOrderByType(FileSortOrder.Type type, FileSortOrder d
return defaultOrder;
}

ArbitraryDataProvider dataProvider = new ArbitraryDataProviderImpl(context);

String value = dataProvider.getValue(user.getAccountName(), PREF__FOLDER_SORT_ORDER + "_" + type);
String value = arbitraryDataProvider.getValue(user.getAccountName(), PREF__FOLDER_SORT_ORDER + "_" + type);

return value.isEmpty() ? defaultOrder : FileSortOrder.sortOrders.get(value);
}

@Override
public void setSortOrder(FileSortOrder.Type type, FileSortOrder sortOrder) {
User user = userAccountManager.getUser();
ArbitraryDataProvider dataProvider = new ArbitraryDataProviderImpl(context);
dataProvider.storeOrUpdateKeyValue(user.getAccountName(), PREF__FOLDER_SORT_ORDER + "_" + type, sortOrder.name);
storeValueInBackground(user.getAccountName(), PREF__FOLDER_SORT_ORDER + "_" + type, sortOrder.name);
}

@Override
Expand Down Expand Up @@ -688,49 +690,37 @@ public long getPhotoSearchTimestamp() {
* <p>
* Anonymous users or {@code null} folders will always return the {@code defaultValue}.
*
* @param context The Android context.
* @param user The user for whom the preference is queried.
* @param preferenceName The name/key of the preference to look up.
* @param folder The folder to check.
* @param defaultValue The value to return if no preference is set in the folder hierarchy.
* @return The preference value for the folder, or {@code defaultValue} if none is set.
*/
private static String getFolderPreference(final Context context,
final User user,
final String preferenceName,
final OCFile folder,
final String defaultValue) {
private String getFolderPreference(final User user,
final String preferenceName,
final OCFile folder,
final String defaultValue) {
if (user.isAnonymous() || folder == null) {
return defaultValue;
}

ArbitraryDataProvider dataProvider = new ArbitraryDataProviderImpl(context);
FileDataStorageManager storageManager = new FileDataStorageManager(user, context.getContentResolver());

String value = dataProvider.getValue(user.getAccountName(), getKeyFromFolder(preferenceName, folder));
String value = arbitraryDataProvider.getValue(user.getAccountName(), getKeyFromFolder(preferenceName, folder));
OCFile prefFolder = folder;
while (prefFolder != null && value.isEmpty()) {
prefFolder = storageManager.getFileById(prefFolder.getParentId());
value = dataProvider.getValue(user.getAccountName(), getKeyFromFolder(preferenceName, prefFolder));
value = arbitraryDataProvider.getValue(user.getAccountName(), getKeyFromFolder(preferenceName, prefFolder));
}
return value.isEmpty() ? defaultValue : value;
}

/**
* Set preference value for a folder.
*
* @param context Context object.
* @param preferenceName Name of the preference to set.
* @param folder Folder.
* @param value Preference value to set.
*/
private static void setFolderPreference(final Context context,
final User user,
final String preferenceName,
@Nullable final OCFile folder,
final String value) {
ArbitraryDataProvider dataProvider = new ArbitraryDataProviderImpl(context);
dataProvider.storeOrUpdateKeyValue(user.getAccountName(), getKeyFromFolder(preferenceName, folder), value);
private void storeValueInBackground(final String accountName, final String key, final String value) {
arbitraryDataWriter.execute(() -> arbitraryDataProvider.storeOrUpdateKeyValue(accountName, key, value));
}

public static void shutdown() {
arbitraryDataWriter.shutdown();
}

private static String getKeyFromFolder(String preferenceName, @Nullable OCFile folder) {
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/java/com/nextcloud/client/preferences/PreferencesModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import android.content.SharedPreferences;

import com.nextcloud.client.account.UserAccountManager;
import com.owncloud.android.datamodel.ArbitraryDataProvider;

import javax.inject.Singleton;

Expand All @@ -29,7 +30,8 @@ public SharedPreferences sharedPreferences(Context context) {
@Singleton
public AppPreferences appPreferences(Context context,
SharedPreferences sharedPreferences,
UserAccountManager userAccountManager) {
return new AppPreferencesImpl(context, sharedPreferences, userAccountManager);
UserAccountManager userAccountManager,
ArbitraryDataProvider arbitraryDataProvider) {
return new AppPreferencesImpl(context, sharedPreferences, userAccountManager, arbitraryDataProvider);
}
}
4 changes: 1 addition & 3 deletions app/src/main/java/com/owncloud/android/MainApp.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.net.ConnectivityManager;
import android.os.Bundle;
import android.os.Environment;
import android.os.StrictMode;
Expand Down Expand Up @@ -79,7 +78,6 @@
import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.lib.resources.status.NextcloudVersion;
import com.owncloud.android.lib.resources.status.OCCapability;
import com.owncloud.android.lib.resources.status.OwnCloudVersion;
import com.owncloud.android.providers.documentstorage.DocumentsStorageProvider;
import com.owncloud.android.ui.navigation.NavigatorActivity;
Expand All @@ -89,7 +87,6 @@
import com.owncloud.android.utils.PermissionUtil;
import com.owncloud.android.utils.ReceiversHelper;
import com.owncloud.android.utils.SecurityUtils;
import com.owncloud.android.utils.theme.CapabilityUtils;
import com.owncloud.android.utils.theme.ViewThemeUtils;

import org.conscrypt.Conscrypt;
Expand Down Expand Up @@ -1029,5 +1026,6 @@ public void onTerminate() {
super.onTerminate();
connectivityService.removeListener(this);
ReceiversHelper.shutdown();
AppPreferencesImpl.shutdown();
}
}
6 changes: 5 additions & 1 deletion app/src/test/java/com/nextcloud/client/preferences/TestAppPreferences.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import android.content.SharedPreferences;

import com.nextcloud.client.account.UserAccountManager;
import com.owncloud.android.datamodel.ArbitraryDataProvider;

import org.junit.Before;
import org.junit.Test;
Expand Down Expand Up @@ -136,14 +137,17 @@ public static class Preferences {
@Mock
private UserAccountManager userAccountManager;

@Mock
private ArbitraryDataProvider arbitraryDataProvider;

private AppPreferencesImpl appPreferences;

@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
when(editor.remove(anyString())).thenReturn(editor);
when(sharedPreferences.edit()).thenReturn(editor);
appPreferences = new AppPreferencesImpl(testContext, sharedPreferences, userAccountManager);
appPreferences = new AppPreferencesImpl(testContext, sharedPreferences, userAccountManager, arbitraryDataProvider);
}

@Test
Expand Down
Loading