From 2eaa581fb58a4f9c3162ca1502d9a2d1c318a6a1 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Wed, 21 Oct 2026 15:26:51 +0200 Subject: [PATCH 01/14] improve sync error handling Signed-off-by: alperozturk96 --- .../owncloud/notes/main/MainActivity.java | 45 +++++++---------- .../owncloud/notes/main/SyncErrorMessage.kt | 12 ++--- .../owncloud/notes/main/SyncErrorSnackbar.kt | 49 +++++++++++++++++++ .../notes/persistence/NoteSyncException.kt | 6 ++- .../persistence/NotesServerSyncTask.java | 2 +- .../notes/persistence/SyncFailureReason.kt | 4 +- app/src/main/res/values/strings.xml | 5 +- 7 files changed, 84 insertions(+), 39 deletions(-) create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorSnackbar.kt diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java index 1a677efcb..ca311bbf2 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java @@ -73,7 +73,6 @@ import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException; import com.nextcloud.android.sso.exceptions.NextcloudHttpRequestFailedException; import com.nextcloud.android.sso.exceptions.NoCurrentAccountSelectedException; -import com.nextcloud.android.sso.exceptions.TokenMismatchException; import com.nextcloud.android.sso.exceptions.UnknownErrorException; import com.nextcloud.android.sso.helper.SingleAccountHelper; import com.owncloud.android.lib.common.utils.Log_OC; @@ -223,11 +222,7 @@ protected void onCreate(Bundle savedInstanceState) { mainViewModel.getSyncStatus().observe(this, syncStatus -> swipeRefreshLayout.setRefreshing(syncStatus)); mainViewModel.getSyncErrors().observe(this, exceptions -> { if (mainViewModel.containsNonInfrastructureRelatedItems(exceptions)) { - BrandedSnackbar.make(coordinatorLayout, SyncErrorMessage.of(exceptions), Snackbar.LENGTH_LONG) - .setAnchorView(binding.activityNotesListView.fabCreate) - .setAction(R.string.simple_more, v -> ExceptionDialogFragment.newInstance(exceptions) - .show(getSupportFragmentManager(), ExceptionDialogFragment.class.getSimpleName())) - .show(); + SyncErrorSnackbar.show(this, coordinatorLayout, binding.activityNotesListView.fabCreate, exceptions); } }); mainViewModel.getSelectedCategory().observe(this, (selectedCategory) -> { @@ -332,11 +327,8 @@ public void onError(@NonNull Throwable t) { .setAnchorView(binding.activityNotesListView.fabCreate) .show(); } else { - BrandedSnackbar.make(coordinatorLayout, SyncErrorMessage.of(t), Snackbar.LENGTH_LONG) - .setAction(R.string.simple_more, v -> ExceptionDialogFragment.newInstance(t) - .show(getSupportFragmentManager(), ExceptionDialogFragment.class.getSimpleName())) - .setAnchorView(binding.activityNotesListView.fabCreate) - .show(); + SyncErrorSnackbar.show(MainActivity.this, coordinatorLayout, + binding.activityNotesListView.fabCreate, t); } }); } @@ -627,11 +619,8 @@ public void onError(@NonNull Throwable t) { .setAnchorView(binding.activityNotesListView.fabCreate) .show(); } else { - BrandedSnackbar.make(coordinatorLayout, SyncErrorMessage.of(t), Snackbar.LENGTH_LONG) - .setAction(R.string.simple_more, v -> ExceptionDialogFragment.newInstance(t) - .show(getSupportFragmentManager(), ExceptionDialogFragment.class.getSimpleName())) - .setAnchorView(binding.activityNotesListView.fabCreate) - .show(); + SyncErrorSnackbar.show(MainActivity.this, coordinatorLayout, + binding.activityNotesListView.fabCreate, t); } }); } @@ -840,8 +829,20 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { default -> { try { AccountImporter.onActivityResult(requestCode, resultCode, data, this, (ssoAccount) -> { + ApiProvider.getInstance().invalidateAPICache(ssoAccount); CapabilitiesWorker.update(this); executor.submit(() -> { + final var existingAccount = mainViewModel.getLocalAccountByAccountName(ssoAccount.name); + if (existingAccount != null) { + runOnUiThread(() -> { + mainViewModel.postCurrentAccount(existingAccount); + BrandedSnackbar + .make(coordinatorLayout, R.string.account_access_renewed, Snackbar.LENGTH_LONG) + .setAnchorView(binding.activityNotesListView.fabCreate) + .show(); + }); + return; + } final var importSnackbar = BrandedSnackbar.make(coordinatorLayout, R.string.progress_import_indeterminate, Snackbar.LENGTH_INDEFINITE) .setAnchorView(binding.activityNotesListView.fabCreate); Log.i(TAG, "Added account: " + "name:" + ssoAccount.name + ", " + ssoAccount.url + ", userId" + ssoAccount.userId); @@ -879,17 +880,7 @@ public void onError(@NonNull Throwable t) { } catch (Throwable e) { importSnackbar.dismiss(); ApiProvider.getInstance().invalidateAPICache(ssoAccount); - // Happens when importing an already existing account the second time - if (e instanceof TokenMismatchException && mainViewModel.getLocalAccountByAccountName(ssoAccount.name) != null) { - Log.w(TAG, "Received " + TokenMismatchException.class.getSimpleName() + " and the given ssoAccount.name (" + ssoAccount.name + ") does already exist in the database. Assume that this account has already been imported."); - runOnUiThread(() -> { - mainViewModel.postCurrentAccount(mainViewModel.getLocalAccountByAccountName(ssoAccount.name)); - // TODO there is already a sync in progress and results in displaying a TokenMissMatchException snackbar which conflicts with this one - coordinatorLayout.post(() -> BrandedSnackbar.make(coordinatorLayout, R.string.account_already_imported, Snackbar.LENGTH_LONG) - .setAnchorView(binding.activityNotesListView.fabCreate) - .show()); - }); - } else if (e instanceof UnknownErrorException && e.getMessage() != null && e.getMessage().contains("No address associated with hostname")) { + if (e instanceof UnknownErrorException && e.getMessage() != null && e.getMessage().contains("No address associated with hostname")) { // https://github.com/nextcloud/notes-android/issues/1014 runOnUiThread(() -> Snackbar.make(coordinatorLayout, R.string.you_have_to_be_connected_to_the_internet_in_order_to_add_an_account, Snackbar.LENGTH_LONG) .setAnchorView(binding.activityNotesListView.fabCreate) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorMessage.kt b/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorMessage.kt index 3585d4b15..6fce1c501 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorMessage.kt +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorMessage.kt @@ -15,14 +15,14 @@ import it.niedermann.owncloud.notes.persistence.NoteSyncException import it.niedermann.owncloud.notes.persistence.SyncFailureReason object SyncErrorMessage { - @JvmStatic @StringRes - fun of(exceptions: Collection): Int = - (exceptions.map { it.syncFailureReason() }.distinct().singleOrNull() ?: SyncFailureReason.UNKNOWN).message + fun of(exceptions: Collection): Int = reasonOf(exceptions).message - @JvmStatic - @StringRes - fun of(exception: Throwable): Int = exception.syncFailureReason().message + fun isTokenMismatch(exceptions: Collection): Boolean = + reasonOf(exceptions) == SyncFailureReason.TOKEN_MISMATCH + + private fun reasonOf(exceptions: Collection): SyncFailureReason = + exceptions.map { it.syncFailureReason() }.distinct().singleOrNull() ?: SyncFailureReason.UNKNOWN private fun Throwable.syncFailureReason(): SyncFailureReason = generateSequence(this) { it.cause }.firstNotNullOfOrNull { it.directSyncFailureReason() } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorSnackbar.kt b/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorSnackbar.kt new file mode 100644 index 000000000..0b13e835f --- /dev/null +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorSnackbar.kt @@ -0,0 +1,49 @@ +/* + * Nextcloud - Android Client + * + * SPDX-FileCopyrightText: 2026 Alper Ozturk + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +package it.niedermann.owncloud.notes.main + +import android.view.View +import androidx.fragment.app.FragmentActivity +import com.google.android.material.snackbar.Snackbar +import com.nextcloud.android.sso.AccountImporter +import com.nextcloud.android.sso.exceptions.SSOException +import com.nextcloud.android.sso.helper.SingleAccountHelper +import it.niedermann.owncloud.notes.R +import it.niedermann.owncloud.notes.branding.BrandedSnackbar +import it.niedermann.owncloud.notes.exception.ExceptionDialogFragment + +object SyncErrorSnackbar { + @JvmStatic + fun show(activity: FragmentActivity, parent: View, anchor: View, exceptions: Collection) { + val snackbar = BrandedSnackbar.make(parent, SyncErrorMessage.of(exceptions), Snackbar.LENGTH_LONG) + .setAnchorView(anchor) + if (SyncErrorMessage.isTokenMismatch(exceptions)) { + snackbar.setAction(R.string.error_action_grant_access) { requestAccessAgain(activity) } + } else { + snackbar.setAction(R.string.simple_more) { showDetails(activity, exceptions) } + } + snackbar.show() + } + + @JvmStatic + fun show(activity: FragmentActivity, parent: View, anchor: View, exception: Throwable) = + show(activity, parent, anchor, listOf(exception)) + + private fun requestAccessAgain(activity: FragmentActivity) { + try { + val ssoAccount = SingleAccountHelper.getCurrentSingleSignOnAccount(activity) + AccountImporter.authenticateSingleSignAccount(activity, ssoAccount) + } catch (e: SSOException) { + showDetails(activity, listOf(e)) + } + } + + private fun showDetails(activity: FragmentActivity, exceptions: Collection) { + ExceptionDialogFragment.newInstance(ArrayList(exceptions)) + .show(activity.supportFragmentManager, ExceptionDialogFragment::class.java.simpleName) + } +} diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteSyncException.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteSyncException.kt index 4a666292a..0a2418451 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteSyncException.kt +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NoteSyncException.kt @@ -6,9 +6,13 @@ */ package it.niedermann.owncloud.notes.persistence +import com.nextcloud.android.sso.helper.Retrofit2Helper import retrofit2.Response class NoteSyncException(noteTitle: String, response: Response<*>) : - Exception("Could not sync \"$noteTitle\" (HTTP ${response.code()}): ${response.message()}") { + Exception( + "Could not sync \"$noteTitle\" (HTTP ${response.code()}): ${response.message()}", + Retrofit2Helper.getException(response) + ) { val reason = SyncFailureReason.fromStatusCode(response.code()) } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTask.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTask.java index 087b03cfc..175f806ab 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTask.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTask.java @@ -138,7 +138,7 @@ private boolean pushLocalChange(@NonNull Note note) { } return recordFailure(step, e); } catch (Exception e) { - if (e instanceof TokenMismatchException) { + if (e.getCause() instanceof TokenMismatchException) { apiProvider.invalidateAPICache(ssoAccount); } return recordFailure(step, e); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncFailureReason.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncFailureReason.kt index 34dbed04d..c5fc91169 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncFailureReason.kt +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncFailureReason.kt @@ -31,7 +31,7 @@ enum class SyncFailureReason(@StringRes val message: Int) { private const val HTTP_INSUFFICIENT_STORAGE = 507 private const val SSO_LOCAL_FAILURE = 900 - fun fromStatusCode(statusCode: Int): SyncFailureReason = when (statusCode) { + fun fromStatusCode(statusCode: Int): SyncFailureReason? = when (statusCode) { HTTP_UNAUTHORIZED -> UNAUTHORIZED HTTP_FORBIDDEN -> PERMISSION HTTP_NOT_FOUND -> NOTES_APP_UNAVAILABLE @@ -39,7 +39,7 @@ enum class SyncFailureReason(@StringRes val message: Int) { HTTP_INTERNAL_ERROR -> SERVER_ERROR HTTP_UNAVAILABLE -> MAINTENANCE HTTP_INSUFFICIENT_STORAGE -> INSUFFICIENT_STORAGE - SSO_LOCAL_FAILURE -> SERVER_UNREACHABLE + SSO_LOCAL_FAILURE -> null else -> UNKNOWN } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6921a793f..05e80730c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -202,7 +202,7 @@ The server is in maintenance mode. Your changes will sync later. Your Nextcloud storage is full. Free up space to sync your changes. Could not reach your server. Check your connection and the Nextcloud Files app. - Notes lost access to your Files app account. Remove and add the account again. + Notes lost access to your Nextcloud account. Grant access again to keep syncing. No network connection Server is in maintenance mode An unknown error has occurred. @@ -325,7 +325,7 @@ Presents - Account has already been imported + Access to your account was renewed. No notes yet Press + button to create a new note More @@ -470,6 +470,7 @@ Open App info Network settings Update + Grant access No account configured yet You don\'t have configured any other accounts yet. Choose account From 8a62652c4ef745211b4f2a7cff18f92e1e2a93da Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Wed, 21 Oct 2026 15:35:14 +0200 Subject: [PATCH 02/14] use single event for sync errors Signed-off-by: alperozturk96 --- .../notes/persistence/NotesRepository.java | 3 +- .../notes/shared/util/SingleLiveEvent.kt | 29 +++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/shared/util/SingleLiveEvent.kt diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java index 70f06b18f..bfa29bd5c 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java @@ -85,6 +85,7 @@ import it.niedermann.owncloud.notes.shared.util.ConnectionLiveData; import it.niedermann.owncloud.notes.shared.util.NoteUtil; import it.niedermann.owncloud.notes.shared.util.SSOUtil; +import it.niedermann.owncloud.notes.shared.util.SingleLiveEvent; import retrofit2.Call; @SuppressWarnings("UnusedReturnValue") @@ -107,7 +108,7 @@ public class NotesRepository { private String syncOnlyOnWifiKey; private boolean syncOnlyOnWifi; private final MutableLiveData syncStatus = new MutableLiveData<>(false); - private final MutableLiveData> syncErrors = new MutableLiveData<>(); + private final SingleLiveEvent> syncErrors = new SingleLiveEvent<>(); private final Handler mainHandler = new Handler(Looper.getMainLooper()); private final Observer syncObserver = (Observer) connectionType -> { diff --git a/app/src/main/java/it/niedermann/owncloud/notes/shared/util/SingleLiveEvent.kt b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/SingleLiveEvent.kt new file mode 100644 index 000000000..99070a16f --- /dev/null +++ b/app/src/main/java/it/niedermann/owncloud/notes/shared/util/SingleLiveEvent.kt @@ -0,0 +1,29 @@ +/* + * Nextcloud - Android Client + * + * SPDX-FileCopyrightText: 2026 Alper Ozturk + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +package it.niedermann.owncloud.notes.shared.util + +import androidx.lifecycle.LifecycleOwner +import androidx.lifecycle.MutableLiveData +import androidx.lifecycle.Observer +import java.util.concurrent.atomic.AtomicBoolean + +class SingleLiveEvent : MutableLiveData() { + private val pending = AtomicBoolean(false) + + override fun observe(owner: LifecycleOwner, observer: Observer) { + super.observe(owner) { value -> + if (pending.compareAndSet(true, false)) { + observer.onChanged(value) + } + } + } + + override fun setValue(value: T?) { + pending.set(true) + super.setValue(value) + } +} From 3fdc17dc1bee8f496ffca3313933e32e1aae9330 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Fri, 20 Nov 2026 09:30:56 +0100 Subject: [PATCH 03/14] update lib and new translation key Signed-off-by: alperozturk96 --- .../owncloud/notes/persistence/SyncFailureReason.kt | 2 +- app/src/main/res/values/strings.xml | 2 +- build.gradle | 2 +- gradle/verification-metadata.xml | 8 ++++++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncFailureReason.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncFailureReason.kt index c5fc91169..915387480 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncFailureReason.kt +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncFailureReason.kt @@ -23,7 +23,7 @@ enum class SyncFailureReason(@StringRes val message: Int) { MAINTENANCE(R.string.error_sync_maintenance), INSUFFICIENT_STORAGE(R.string.error_sync_insufficient_storage), SERVER_UNREACHABLE(R.string.error_sync_server_unreachable), - TOKEN_MISMATCH(R.string.error_sync_token_mismatch), + TOKEN_MISMATCH(R.string.error_sync_token), UNKNOWN(R.string.error_synchronization); companion object { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 05e80730c..8da0b45f9 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -202,7 +202,7 @@ The server is in maintenance mode. Your changes will sync later. Your Nextcloud storage is full. Free up space to sync your changes. Could not reach your server. Check your connection and the Nextcloud Files app. - Notes lost access to your Nextcloud account. Grant access again to keep syncing. + Notes lost access to your Nextcloud account. Grant access again to keep syncing. No network connection Server is in maintenance mode An unknown error has occurred. diff --git a/build.gradle b/build.gradle index 485ccc04b..0c151ac56 100644 --- a/build.gradle +++ b/build.gradle @@ -14,7 +14,7 @@ buildscript { commonsVersion = '2.4.1' androidCommonsVersion = '1.1.1' nextcloudAndroidCommonLib = "0.35.0" - singleSignOnVersion = "1.3.5" + singleSignOnVersion = "9e9ccdc177" } repositories { mavenCentral() diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index 9c200fdcc..cdd1c3255 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -14026,6 +14026,14 @@ + + + + + + + + From a6bffeec1b493d9c6b93b5c0a6fa3c2035ff7d09 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Fri, 20 Nov 2026 10:43:31 +0100 Subject: [PATCH 04/14] detect removed account and warn user Signed-off-by: alperozturk96 --- .../owncloud/notes/main/SyncErrorMessage.kt | 11 +++----- .../owncloud/notes/main/SyncErrorSnackbar.kt | 25 +++++++++++++++---- .../notes/persistence/FilesAppAccount.kt | 24 ++++++++++++++++++ .../notes/persistence/NotesRepository.java | 4 +-- .../persistence/NotesServerSyncTask.java | 3 +-- .../notes/persistence/SyncFailureReason.kt | 1 + app/src/main/res/values/strings.xml | 1 + 7 files changed, 52 insertions(+), 17 deletions(-) create mode 100644 app/src/main/java/it/niedermann/owncloud/notes/persistence/FilesAppAccount.kt diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorMessage.kt b/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorMessage.kt index 6fce1c501..6ffe13780 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorMessage.kt +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorMessage.kt @@ -6,8 +6,8 @@ */ package it.niedermann.owncloud.notes.main -import androidx.annotation.StringRes import com.nextcloud.android.sso.exceptions.NextcloudApiNotRespondingException +import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException import com.nextcloud.android.sso.exceptions.NextcloudHttpRequestFailedException import com.nextcloud.android.sso.exceptions.NextcloudNetworkException import com.nextcloud.android.sso.exceptions.TokenMismatchException @@ -15,13 +15,7 @@ import it.niedermann.owncloud.notes.persistence.NoteSyncException import it.niedermann.owncloud.notes.persistence.SyncFailureReason object SyncErrorMessage { - @StringRes - fun of(exceptions: Collection): Int = reasonOf(exceptions).message - - fun isTokenMismatch(exceptions: Collection): Boolean = - reasonOf(exceptions) == SyncFailureReason.TOKEN_MISMATCH - - private fun reasonOf(exceptions: Collection): SyncFailureReason = + fun reasonOf(exceptions: Collection): SyncFailureReason = exceptions.map { it.syncFailureReason() }.distinct().singleOrNull() ?: SyncFailureReason.UNKNOWN private fun Throwable.syncFailureReason(): SyncFailureReason = @@ -33,6 +27,7 @@ object SyncErrorMessage { is NextcloudHttpRequestFailedException -> SyncFailureReason.fromStatusCode(statusCode) is NextcloudNetworkException, is NextcloudApiNotRespondingException -> SyncFailureReason.SERVER_UNREACHABLE is TokenMismatchException -> SyncFailureReason.TOKEN_MISMATCH + is NextcloudFilesAppAccountNotFoundException -> SyncFailureReason.ACCOUNT_REMOVED else -> null } } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorSnackbar.kt b/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorSnackbar.kt index 0b13e835f..5a3737e32 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorSnackbar.kt +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorSnackbar.kt @@ -15,17 +15,24 @@ import com.nextcloud.android.sso.helper.SingleAccountHelper import it.niedermann.owncloud.notes.R import it.niedermann.owncloud.notes.branding.BrandedSnackbar import it.niedermann.owncloud.notes.exception.ExceptionDialogFragment +import it.niedermann.owncloud.notes.persistence.SyncFailureReason object SyncErrorSnackbar { @JvmStatic fun show(activity: FragmentActivity, parent: View, anchor: View, exceptions: Collection) { - val snackbar = BrandedSnackbar.make(parent, SyncErrorMessage.of(exceptions), Snackbar.LENGTH_LONG) + val reason = SyncErrorMessage.reasonOf(exceptions) + val snackbar = BrandedSnackbar.make(parent, reason.message, Snackbar.LENGTH_LONG) .setAnchorView(anchor) - if (SyncErrorMessage.isTokenMismatch(exceptions)) { - snackbar.setAction(R.string.error_action_grant_access) { requestAccessAgain(activity) } - } else { - snackbar.setAction(R.string.simple_more) { showDetails(activity, exceptions) } + when (reason) { + SyncFailureReason.TOKEN_MISMATCH -> + snackbar.setAction(R.string.error_action_grant_access) { requestAccessAgain(activity) } + + SyncFailureReason.ACCOUNT_REMOVED -> + snackbar.setAction(R.string.choose_account) { chooseAccount(activity) } + + else -> snackbar.setAction(R.string.simple_more) { showDetails(activity, exceptions) } } + snackbar.show() } @@ -42,6 +49,14 @@ object SyncErrorSnackbar { } } + private fun chooseAccount(activity: FragmentActivity) { + try { + AccountImporter.pickNewAccount(activity) + } catch (e: SSOException) { + showDetails(activity, listOf(e)) + } + } + private fun showDetails(activity: FragmentActivity, exceptions: Collection) { ExceptionDialogFragment.newInstance(ArrayList(exceptions)) .show(activity.supportFragmentManager, ExceptionDialogFragment::class.java.simpleName) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/FilesAppAccount.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/FilesAppAccount.kt new file mode 100644 index 000000000..37c10e491 --- /dev/null +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/FilesAppAccount.kt @@ -0,0 +1,24 @@ +/* + * Nextcloud - Android Client + * + * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +package it.niedermann.owncloud.notes.persistence + +import android.content.Context +import com.nextcloud.android.sso.AccountImporter +import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException +import com.nextcloud.android.sso.model.SingleSignOnAccount + +object FilesAppAccount { + @JvmStatic + @Throws(NextcloudFilesAppAccountNotFoundException::class) + fun require(context: Context, accountName: String): SingleSignOnAccount { + if (AccountImporter.getAccountForName(context, accountName) == null) { + throw NextcloudFilesAppAccountNotFoundException(context, accountName) + } + + return AccountImporter.getSingleSignOnAccount(context, accountName) + } +} diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java index bfa29bd5c..84c333a08 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java @@ -888,7 +888,6 @@ public synchronized void scheduleSync(@Nullable Account account, boolean onlyLoc syncActive.putIfAbsent(account.getId(), false); Log.d(TAG, "Sync requested (" + (onlyLocalChanges ? "onlyLocalChanges" : "full") + "; " + (Boolean.TRUE.equals(syncActive.get(account.getId())) ? "sync active" : "sync NOT active") + ") ..."); if (isSyncPossible() && (!Boolean.TRUE.equals(syncActive.get(account.getId())) || onlyLocalChanges)) { - syncActive.put(account.getId(), true); try { Log.d(TAG, "... starting now"); final NotesServerSyncTask syncTask = new NotesServerSyncTask(context, this, account, onlyLocalChanges, apiProvider) { @@ -938,10 +937,11 @@ void onPostExecute(SyncResultStatus status) { syncTask.addCallbacks(account, callbacksPull.get(account.getId())); callbacksPull.put(account.getId(), new ArrayList<>()); } + syncActive.put(account.getId(), true); syncExecutor.submit(syncTask); } catch (NextcloudFilesAppAccountNotFoundException e) { Log.e(TAG, "... Could not find " + SingleSignOnAccount.class.getSimpleName() + " for account name " + account.getAccountName()); - e.printStackTrace(); + syncErrors.postValue(new ArrayList<>(List.of(e))); } } else if (!onlyLocalChanges) { Log.d(TAG, "... scheduled"); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTask.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTask.java index 175f806ab..ee70e7a03 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTask.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTask.java @@ -18,7 +18,6 @@ import androidx.annotation.NonNull; -import com.nextcloud.android.sso.AccountImporter; import com.nextcloud.android.sso.exceptions.NextcloudApiNotRespondingException; import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException; import com.nextcloud.android.sso.exceptions.NextcloudHttpRequestFailedException; @@ -71,7 +70,7 @@ abstract class NotesServerSyncTask extends Thread { this.context = context; this.repo = repo; this.localAccount = localAccount; - this.ssoAccount = AccountImporter.getSingleSignOnAccount(context, localAccount.getAccountName()); + this.ssoAccount = FilesAppAccount.require(context, localAccount.getAccountName()); this.onlyLocalChanges = onlyLocalChanges; this.apiProvider = apiProvider; } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncFailureReason.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncFailureReason.kt index 915387480..e9ff6fb9d 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncFailureReason.kt +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncFailureReason.kt @@ -24,6 +24,7 @@ enum class SyncFailureReason(@StringRes val message: Int) { INSUFFICIENT_STORAGE(R.string.error_sync_insufficient_storage), SERVER_UNREACHABLE(R.string.error_sync_server_unreachable), TOKEN_MISMATCH(R.string.error_sync_token), + ACCOUNT_REMOVED(R.string.error_sync_account_removed), UNKNOWN(R.string.error_synchronization); companion object { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8da0b45f9..98607c728 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -203,6 +203,7 @@ Your Nextcloud storage is full. Free up space to sync your changes. Could not reach your server. Check your connection and the Nextcloud Files app. Notes lost access to your Nextcloud account. Grant access again to keep syncing. + This account was removed from the Nextcloud Files app. Choose an account to keep syncing. No network connection Server is in maintenance mode An unknown error has occurred. From 28940ce751ef6233f6bc0d23ed8a2c896f60db53 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Fri, 20 Nov 2026 10:49:09 +0100 Subject: [PATCH 05/14] make sync snackbar class Signed-off-by: alperozturk96 --- .../niedermann/owncloud/notes/main/MainActivity.java | 12 +++++++----- .../owncloud/notes/main/SyncErrorMessage.kt | 4 ++-- .../owncloud/notes/main/SyncErrorSnackbar.kt | 11 +++-------- .../owncloud/notes/persistence/FilesAppAccount.kt | 2 +- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java index ca311bbf2..66abbc826 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java @@ -80,6 +80,7 @@ import org.jetbrains.annotations.NotNull; import java.net.HttpURLConnection; +import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.Objects; @@ -168,12 +169,15 @@ public class MainActivity extends LockedActivity implements NoteClickListener, A boolean canMoveNoteToAnotherAccounts = false; + private SyncErrorSnackbar syncErrorSnackbar; + @Override protected void onCreate(Bundle savedInstanceState) { SplashScreen.installSplashScreen(this); super.onCreate(savedInstanceState); + syncErrorSnackbar = new SyncErrorSnackbar(this); mainViewModel = new ViewModelProvider(this).get(MainViewModel.class); CapabilitiesWorker.update(this); binding = DrawerLayoutBinding.inflate(getLayoutInflater()); @@ -222,7 +226,7 @@ protected void onCreate(Bundle savedInstanceState) { mainViewModel.getSyncStatus().observe(this, syncStatus -> swipeRefreshLayout.setRefreshing(syncStatus)); mainViewModel.getSyncErrors().observe(this, exceptions -> { if (mainViewModel.containsNonInfrastructureRelatedItems(exceptions)) { - SyncErrorSnackbar.show(this, coordinatorLayout, binding.activityNotesListView.fabCreate, exceptions); + syncErrorSnackbar.show(coordinatorLayout, binding.activityNotesListView.fabCreate, new ArrayList<>(exceptions)); } }); mainViewModel.getSelectedCategory().observe(this, (selectedCategory) -> { @@ -327,8 +331,7 @@ public void onError(@NonNull Throwable t) { .setAnchorView(binding.activityNotesListView.fabCreate) .show(); } else { - SyncErrorSnackbar.show(MainActivity.this, coordinatorLayout, - binding.activityNotesListView.fabCreate, t); + syncErrorSnackbar.show(coordinatorLayout, binding.activityNotesListView.fabCreate, t); } }); } @@ -619,8 +622,7 @@ public void onError(@NonNull Throwable t) { .setAnchorView(binding.activityNotesListView.fabCreate) .show(); } else { - SyncErrorSnackbar.show(MainActivity.this, coordinatorLayout, - binding.activityNotesListView.fabCreate, t); + syncErrorSnackbar.show(coordinatorLayout, binding.activityNotesListView.fabCreate, t); } }); } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorMessage.kt b/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorMessage.kt index 6ffe13780..6f3b3a057 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorMessage.kt +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorMessage.kt @@ -14,8 +14,8 @@ import com.nextcloud.android.sso.exceptions.TokenMismatchException import it.niedermann.owncloud.notes.persistence.NoteSyncException import it.niedermann.owncloud.notes.persistence.SyncFailureReason -object SyncErrorMessage { - fun reasonOf(exceptions: Collection): SyncFailureReason = +class SyncErrorMessage(private val exceptions: Collection) { + fun reasonOf(): SyncFailureReason = exceptions.map { it.syncFailureReason() }.distinct().singleOrNull() ?: SyncFailureReason.UNKNOWN private fun Throwable.syncFailureReason(): SyncFailureReason = diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorSnackbar.kt b/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorSnackbar.kt index 5a3737e32..383c0f9b3 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorSnackbar.kt +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorSnackbar.kt @@ -17,10 +17,9 @@ import it.niedermann.owncloud.notes.branding.BrandedSnackbar import it.niedermann.owncloud.notes.exception.ExceptionDialogFragment import it.niedermann.owncloud.notes.persistence.SyncFailureReason -object SyncErrorSnackbar { - @JvmStatic - fun show(activity: FragmentActivity, parent: View, anchor: View, exceptions: Collection) { - val reason = SyncErrorMessage.reasonOf(exceptions) +class SyncErrorSnackbar(private val activity: FragmentActivity) { + fun show(exceptions: Collection, parent: View, anchor: View) { + val reason = SyncErrorMessage(exceptions).reasonOf() val snackbar = BrandedSnackbar.make(parent, reason.message, Snackbar.LENGTH_LONG) .setAnchorView(anchor) when (reason) { @@ -36,10 +35,6 @@ object SyncErrorSnackbar { snackbar.show() } - @JvmStatic - fun show(activity: FragmentActivity, parent: View, anchor: View, exception: Throwable) = - show(activity, parent, anchor, listOf(exception)) - private fun requestAccessAgain(activity: FragmentActivity) { try { val ssoAccount = SingleAccountHelper.getCurrentSingleSignOnAccount(activity) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/FilesAppAccount.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/FilesAppAccount.kt index 37c10e491..acbede182 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/FilesAppAccount.kt +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/FilesAppAccount.kt @@ -1,7 +1,7 @@ /* * Nextcloud - Android Client * - * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors + * SPDX-FileCopyrightText: 2026 Alper Ozturk * SPDX-License-Identifier: AGPL-3.0-or-later */ package it.niedermann.owncloud.notes.persistence From 78118bfac6696615d2cdc3ca66f0b8318d8f53c1 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Fri, 20 Nov 2026 10:50:01 +0100 Subject: [PATCH 06/14] make sync snackbar class Signed-off-by: alperozturk96 --- .../owncloud/notes/main/MainActivity.java | 8 +++--- .../owncloud/notes/main/SyncErrorSnackbar.kt | 26 ++++++++++++------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java index 66abbc826..c3082a757 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java @@ -177,7 +177,6 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - syncErrorSnackbar = new SyncErrorSnackbar(this); mainViewModel = new ViewModelProvider(this).get(MainViewModel.class); CapabilitiesWorker.update(this); binding = DrawerLayoutBinding.inflate(getLayoutInflater()); @@ -190,6 +189,7 @@ protected void onCreate(Bundle savedInstanceState) { this.coordinatorLayout = binding.activityNotesListView.activityNotesListView; this.swipeRefreshLayout = binding.activityNotesListView.swiperefreshlayout; this.fabCreate = binding.activityNotesListView.fabCreate; + syncErrorSnackbar = new SyncErrorSnackbar(this, coordinatorLayout, fabCreate); this.listView = binding.activityNotesListView.recyclerView; gridView = isGridViewEnabled(); @@ -226,7 +226,7 @@ protected void onCreate(Bundle savedInstanceState) { mainViewModel.getSyncStatus().observe(this, syncStatus -> swipeRefreshLayout.setRefreshing(syncStatus)); mainViewModel.getSyncErrors().observe(this, exceptions -> { if (mainViewModel.containsNonInfrastructureRelatedItems(exceptions)) { - syncErrorSnackbar.show(coordinatorLayout, binding.activityNotesListView.fabCreate, new ArrayList<>(exceptions)); + syncErrorSnackbar.show(exceptions); } }); mainViewModel.getSelectedCategory().observe(this, (selectedCategory) -> { @@ -331,7 +331,7 @@ public void onError(@NonNull Throwable t) { .setAnchorView(binding.activityNotesListView.fabCreate) .show(); } else { - syncErrorSnackbar.show(coordinatorLayout, binding.activityNotesListView.fabCreate, t); + syncErrorSnackbar.show(t); } }); } @@ -622,7 +622,7 @@ public void onError(@NonNull Throwable t) { .setAnchorView(binding.activityNotesListView.fabCreate) .show(); } else { - syncErrorSnackbar.show(coordinatorLayout, binding.activityNotesListView.fabCreate, t); + syncErrorSnackbar.show(t); } }); } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorSnackbar.kt b/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorSnackbar.kt index 383c0f9b3..ab472cab4 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorSnackbar.kt +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorSnackbar.kt @@ -17,42 +17,48 @@ import it.niedermann.owncloud.notes.branding.BrandedSnackbar import it.niedermann.owncloud.notes.exception.ExceptionDialogFragment import it.niedermann.owncloud.notes.persistence.SyncFailureReason -class SyncErrorSnackbar(private val activity: FragmentActivity) { - fun show(exceptions: Collection, parent: View, anchor: View) { +class SyncErrorSnackbar( + private val activity: FragmentActivity, + private val parent: View, + private val anchor: View +) { + fun show(exceptions: Collection) { val reason = SyncErrorMessage(exceptions).reasonOf() val snackbar = BrandedSnackbar.make(parent, reason.message, Snackbar.LENGTH_LONG) .setAnchorView(anchor) when (reason) { SyncFailureReason.TOKEN_MISMATCH -> - snackbar.setAction(R.string.error_action_grant_access) { requestAccessAgain(activity) } + snackbar.setAction(R.string.error_action_grant_access) { requestAccessAgain() } SyncFailureReason.ACCOUNT_REMOVED -> - snackbar.setAction(R.string.choose_account) { chooseAccount(activity) } + snackbar.setAction(R.string.choose_account) { chooseAccount() } - else -> snackbar.setAction(R.string.simple_more) { showDetails(activity, exceptions) } + else -> snackbar.setAction(R.string.simple_more) { showDetails(exceptions) } } snackbar.show() } - private fun requestAccessAgain(activity: FragmentActivity) { + fun show(exception: Throwable) = show(listOf(exception)) + + private fun requestAccessAgain() { try { val ssoAccount = SingleAccountHelper.getCurrentSingleSignOnAccount(activity) AccountImporter.authenticateSingleSignAccount(activity, ssoAccount) } catch (e: SSOException) { - showDetails(activity, listOf(e)) + showDetails(listOf(e)) } } - private fun chooseAccount(activity: FragmentActivity) { + private fun chooseAccount() { try { AccountImporter.pickNewAccount(activity) } catch (e: SSOException) { - showDetails(activity, listOf(e)) + showDetails(listOf(e)) } } - private fun showDetails(activity: FragmentActivity, exceptions: Collection) { + private fun showDetails(exceptions: Collection) { ExceptionDialogFragment.newInstance(ArrayList(exceptions)) .show(activity.supportFragmentManager, ExceptionDialogFragment::class.java.simpleName) } From 398bbb81df5c12b3e814df42abfde3a3920747a0 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Fri, 20 Nov 2026 10:52:56 +0100 Subject: [PATCH 07/14] Rename .java to .kt Signed-off-by: alperozturk96 --- .../notes/branding/{BrandedSnackbar.java => BrandedSnackbar.kt} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename app/src/main/java/it/niedermann/owncloud/notes/branding/{BrandedSnackbar.java => BrandedSnackbar.kt} (100%) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedSnackbar.java b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedSnackbar.kt similarity index 100% rename from app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedSnackbar.java rename to app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedSnackbar.kt From d6f583411f6f1b5302b39a323cd858ed97d61465 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Fri, 20 Nov 2026 10:52:57 +0100 Subject: [PATCH 08/14] consolidate snackbar logic Signed-off-by: alperozturk96 --- .../notes/branding/BrandedSnackbar.kt | 100 ++++++++++++++---- .../owncloud/notes/main/MainActivity.java | 8 +- .../owncloud/notes/main/SyncErrorSnackbar.kt | 65 ------------ 3 files changed, 80 insertions(+), 93 deletions(-) delete mode 100644 app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorSnackbar.kt diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedSnackbar.kt b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedSnackbar.kt index def4950e6..8cfdb85fb 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedSnackbar.kt +++ b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedSnackbar.kt @@ -1,37 +1,91 @@ /* - * Nextcloud Notes - Android Client + * Nextcloud - Android Client * - * SPDX-FileCopyrightText: 2020-2024 Nextcloud GmbH and Nextcloud contributors - * SPDX-License-Identifier: GPL-3.0-or-later + * SPDX-FileCopyrightText: 2026 Alper Ozturk + * SPDX-License-Identifier: AGPL-3.0-or-later */ -package it.niedermann.owncloud.notes.branding; +package it.niedermann.owncloud.notes.branding -import static it.niedermann.owncloud.notes.branding.BrandingUtil.readBrandMainColor; +import android.view.View +import androidx.annotation.ColorInt +import androidx.annotation.StringRes +import androidx.fragment.app.FragmentActivity +import com.google.android.material.snackbar.BaseTransientBottomBar +import com.google.android.material.snackbar.Snackbar +import com.nextcloud.android.sso.AccountImporter +import com.nextcloud.android.sso.exceptions.SSOException +import com.nextcloud.android.sso.helper.SingleAccountHelper +import it.niedermann.owncloud.notes.R +import it.niedermann.owncloud.notes.exception.ExceptionDialogFragment +import it.niedermann.owncloud.notes.main.SyncErrorMessage +import it.niedermann.owncloud.notes.persistence.SyncFailureReason -import android.view.View; +object BrandedSnackbar { + @JvmStatic + fun make( + view: View, + text: CharSequence, + @BaseTransientBottomBar.Duration duration: Int + ): Snackbar { + @ColorInt val color = BrandingUtil.readBrandMainColor(view.context) + val snackbar = Snackbar.make(view, text, duration) + val utils = BrandingUtil.of(color, view.context) -import androidx.annotation.ColorInt; -import androidx.annotation.NonNull; -import androidx.annotation.StringRes; + utils.material.themeSnackbar(snackbar) -import com.google.android.material.snackbar.BaseTransientBottomBar; -import com.google.android.material.snackbar.Snackbar; + return snackbar + } + + @JvmStatic + fun make( + view: View, + @StringRes resId: Int, + @BaseTransientBottomBar.Duration duration: Int + ): Snackbar { + return make(view, view.resources.getText(resId), duration) + } + + @JvmStatic + fun showSyncError(activity: FragmentActivity, view: View, anchor: View, exceptions: Collection) { + val reason = SyncErrorMessage(exceptions).reasonOf() + val snackbar = make(view, reason.message, Snackbar.LENGTH_LONG) + .setAnchorView(anchor) + when (reason) { + SyncFailureReason.TOKEN_MISMATCH -> + snackbar.setAction(R.string.error_action_grant_access) { requestAccessAgain(activity) } -public class BrandedSnackbar { + SyncFailureReason.ACCOUNT_REMOVED -> + snackbar.setAction(R.string.choose_account) { chooseAccount(activity) } - @NonNull - public static Snackbar make(@NonNull View view, @NonNull CharSequence text, @BaseTransientBottomBar.Duration int duration) { - @ColorInt final int color = readBrandMainColor(view.getContext()); - final var snackbar = Snackbar.make(view, text, duration); - final var utils = BrandingUtil.of(color, view.getContext()); + else -> snackbar.setAction(R.string.simple_more) { showDetails(activity, exceptions) } + } - utils.material.themeSnackbar(snackbar); + snackbar.show() + } + + @JvmStatic + fun showSyncError(activity: FragmentActivity, view: View, anchor: View, exception: Throwable) = + showSyncError(activity, view, anchor, listOf(exception)) + + private fun requestAccessAgain(activity: FragmentActivity) { + try { + val ssoAccount = SingleAccountHelper.getCurrentSingleSignOnAccount(activity) + AccountImporter.authenticateSingleSignAccount(activity, ssoAccount) + } catch (e: SSOException) { + showDetails(activity, listOf(e)) + } + } - return snackbar; + private fun chooseAccount(activity: FragmentActivity) { + try { + AccountImporter.pickNewAccount(activity) + } catch (e: SSOException) { + showDetails(activity, listOf(e)) + } } - @NonNull - public static Snackbar make(@NonNull View view, @StringRes int resId, @BaseTransientBottomBar.Duration int duration) { - return make(view, view.getResources().getText(resId), duration); + private fun showDetails(activity: FragmentActivity, exceptions: Collection) { + ExceptionDialogFragment.newInstance(ArrayList(exceptions)) + .show(activity.supportFragmentManager, ExceptionDialogFragment::class.java.simpleName) } -} \ No newline at end of file +} diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java index c3082a757..15d3df86a 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java @@ -169,7 +169,6 @@ public class MainActivity extends LockedActivity implements NoteClickListener, A boolean canMoveNoteToAnotherAccounts = false; - private SyncErrorSnackbar syncErrorSnackbar; @Override protected void onCreate(Bundle savedInstanceState) { @@ -189,7 +188,6 @@ protected void onCreate(Bundle savedInstanceState) { this.coordinatorLayout = binding.activityNotesListView.activityNotesListView; this.swipeRefreshLayout = binding.activityNotesListView.swiperefreshlayout; this.fabCreate = binding.activityNotesListView.fabCreate; - syncErrorSnackbar = new SyncErrorSnackbar(this, coordinatorLayout, fabCreate); this.listView = binding.activityNotesListView.recyclerView; gridView = isGridViewEnabled(); @@ -226,7 +224,7 @@ protected void onCreate(Bundle savedInstanceState) { mainViewModel.getSyncStatus().observe(this, syncStatus -> swipeRefreshLayout.setRefreshing(syncStatus)); mainViewModel.getSyncErrors().observe(this, exceptions -> { if (mainViewModel.containsNonInfrastructureRelatedItems(exceptions)) { - syncErrorSnackbar.show(exceptions); + BrandedSnackbar.showSyncError(this, coordinatorLayout, fabCreate, exceptions); } }); mainViewModel.getSelectedCategory().observe(this, (selectedCategory) -> { @@ -331,7 +329,7 @@ public void onError(@NonNull Throwable t) { .setAnchorView(binding.activityNotesListView.fabCreate) .show(); } else { - syncErrorSnackbar.show(t); + BrandedSnackbar.showSyncError(MainActivity.this, coordinatorLayout, fabCreate, t); } }); } @@ -622,7 +620,7 @@ public void onError(@NonNull Throwable t) { .setAnchorView(binding.activityNotesListView.fabCreate) .show(); } else { - syncErrorSnackbar.show(t); + BrandedSnackbar.showSyncError(MainActivity.this, coordinatorLayout, fabCreate, t); } }); } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorSnackbar.kt b/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorSnackbar.kt deleted file mode 100644 index ab472cab4..000000000 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorSnackbar.kt +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Nextcloud - Android Client - * - * SPDX-FileCopyrightText: 2026 Alper Ozturk - * SPDX-License-Identifier: AGPL-3.0-or-later - */ -package it.niedermann.owncloud.notes.main - -import android.view.View -import androidx.fragment.app.FragmentActivity -import com.google.android.material.snackbar.Snackbar -import com.nextcloud.android.sso.AccountImporter -import com.nextcloud.android.sso.exceptions.SSOException -import com.nextcloud.android.sso.helper.SingleAccountHelper -import it.niedermann.owncloud.notes.R -import it.niedermann.owncloud.notes.branding.BrandedSnackbar -import it.niedermann.owncloud.notes.exception.ExceptionDialogFragment -import it.niedermann.owncloud.notes.persistence.SyncFailureReason - -class SyncErrorSnackbar( - private val activity: FragmentActivity, - private val parent: View, - private val anchor: View -) { - fun show(exceptions: Collection) { - val reason = SyncErrorMessage(exceptions).reasonOf() - val snackbar = BrandedSnackbar.make(parent, reason.message, Snackbar.LENGTH_LONG) - .setAnchorView(anchor) - when (reason) { - SyncFailureReason.TOKEN_MISMATCH -> - snackbar.setAction(R.string.error_action_grant_access) { requestAccessAgain() } - - SyncFailureReason.ACCOUNT_REMOVED -> - snackbar.setAction(R.string.choose_account) { chooseAccount() } - - else -> snackbar.setAction(R.string.simple_more) { showDetails(exceptions) } - } - - snackbar.show() - } - - fun show(exception: Throwable) = show(listOf(exception)) - - private fun requestAccessAgain() { - try { - val ssoAccount = SingleAccountHelper.getCurrentSingleSignOnAccount(activity) - AccountImporter.authenticateSingleSignAccount(activity, ssoAccount) - } catch (e: SSOException) { - showDetails(listOf(e)) - } - } - - private fun chooseAccount() { - try { - AccountImporter.pickNewAccount(activity) - } catch (e: SSOException) { - showDetails(listOf(e)) - } - } - - private fun showDetails(exceptions: Collection) { - ExceptionDialogFragment.newInstance(ArrayList(exceptions)) - .show(activity.supportFragmentManager, ExceptionDialogFragment::class.java.simpleName) - } -} From a3119fc73de31c3f9c4f83e6064e0b2675bd4f54 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Fri, 20 Nov 2026 10:56:51 +0100 Subject: [PATCH 09/14] consolidate branded snackbar usage in mainactivity for sync errors Signed-off-by: alperozturk96 --- .../notes/branding/BrandedSnackbar.kt | 2 ++ .../owncloud/notes/main/MainActivity.java | 26 +++++-------------- .../owncloud/notes/main/SyncErrorMessage.kt | 2 ++ .../notes/persistence/SyncFailureReason.kt | 1 + app/src/main/res/values/strings.xml | 1 + 5 files changed, 12 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedSnackbar.kt b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedSnackbar.kt index 8cfdb85fb..428e5006d 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedSnackbar.kt +++ b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedSnackbar.kt @@ -57,6 +57,8 @@ object BrandedSnackbar { SyncFailureReason.ACCOUNT_REMOVED -> snackbar.setAction(R.string.choose_account) { chooseAccount(activity) } + SyncFailureReason.NO_NETWORK, SyncFailureReason.MAINTENANCE -> Unit + else -> snackbar.setAction(R.string.simple_more) { showDetails(activity, exceptions) } } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java index 15d3df86a..317f4ca55 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java @@ -20,7 +20,6 @@ import static it.niedermann.owncloud.notes.shared.model.ENavigationCategoryType.UNCATEGORIZED; import static it.niedermann.owncloud.notes.shared.util.SSOUtil.askForNewAccount; -import android.accounts.NetworkErrorException; import android.animation.AnimatorInflater; import android.app.SearchManager; import android.content.Context; @@ -71,7 +70,6 @@ import com.nextcloud.android.sso.AccountImporter; import com.nextcloud.android.sso.exceptions.AccountImportCancelledException; import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException; -import com.nextcloud.android.sso.exceptions.NextcloudHttpRequestFailedException; import com.nextcloud.android.sso.exceptions.NoCurrentAccountSelectedException; import com.nextcloud.android.sso.exceptions.UnknownErrorException; import com.nextcloud.android.sso.helper.SingleAccountHelper; @@ -79,8 +77,6 @@ import org.jetbrains.annotations.NotNull; -import java.net.HttpURLConnection; -import java.util.ArrayList; import java.util.LinkedList; import java.util.List; import java.util.Objects; @@ -324,13 +320,10 @@ public void onError(@NonNull Throwable t) { runOnUiThread(() -> { if (t instanceof IntendedOfflineException) { Log.i(TAG, "Capabilities and notes not updated because " + nextAccount.getAccountName() + " is offline by intention."); - } else if (t instanceof NetworkErrorException) { - BrandedSnackbar.make(coordinatorLayout, getString(R.string.error_sync, getString(R.string.error_no_network)), Snackbar.LENGTH_LONG) - .setAnchorView(binding.activityNotesListView.fabCreate) - .show(); - } else { - BrandedSnackbar.showSyncError(MainActivity.this, coordinatorLayout, fabCreate, t); + return; } + + BrandedSnackbar.showSyncError(MainActivity.this, coordinatorLayout, fabCreate, t); }); } }); @@ -611,17 +604,10 @@ public void onError(@NonNull Throwable t) { swipeRefreshLayout.setRefreshing(false); if (t instanceof IntendedOfflineException) { Log.i(TAG, "Capabilities and notes not updated because " + currentAccount.getAccountName() + " is offline by intention."); - } else if (t instanceof NextcloudHttpRequestFailedException && ((NextcloudHttpRequestFailedException) t).getStatusCode() == HttpURLConnection.HTTP_UNAVAILABLE) { - BrandedSnackbar.make(coordinatorLayout, R.string.error_maintenance_mode, Snackbar.LENGTH_LONG) - .setAnchorView(binding.activityNotesListView.fabCreate) - .show(); - } else if (t instanceof NetworkErrorException) { - BrandedSnackbar.make(coordinatorLayout, getString(R.string.error_sync, getString(R.string.error_no_network)), Snackbar.LENGTH_LONG) - .setAnchorView(binding.activityNotesListView.fabCreate) - .show(); - } else { - BrandedSnackbar.showSyncError(MainActivity.this, coordinatorLayout, fabCreate, t); + return; } + + BrandedSnackbar.showSyncError(MainActivity.this, coordinatorLayout, fabCreate, t); }); } }); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorMessage.kt b/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorMessage.kt index 6f3b3a057..ab3115402 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorMessage.kt +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/SyncErrorMessage.kt @@ -6,6 +6,7 @@ */ package it.niedermann.owncloud.notes.main +import android.accounts.NetworkErrorException import com.nextcloud.android.sso.exceptions.NextcloudApiNotRespondingException import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException import com.nextcloud.android.sso.exceptions.NextcloudHttpRequestFailedException @@ -28,6 +29,7 @@ class SyncErrorMessage(private val exceptions: Collection) { is NextcloudNetworkException, is NextcloudApiNotRespondingException -> SyncFailureReason.SERVER_UNREACHABLE is TokenMismatchException -> SyncFailureReason.TOKEN_MISMATCH is NextcloudFilesAppAccountNotFoundException -> SyncFailureReason.ACCOUNT_REMOVED + is NetworkErrorException -> SyncFailureReason.NO_NETWORK else -> null } } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncFailureReason.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncFailureReason.kt index e9ff6fb9d..1d43213e3 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncFailureReason.kt +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/SyncFailureReason.kt @@ -23,6 +23,7 @@ enum class SyncFailureReason(@StringRes val message: Int) { MAINTENANCE(R.string.error_sync_maintenance), INSUFFICIENT_STORAGE(R.string.error_sync_insufficient_storage), SERVER_UNREACHABLE(R.string.error_sync_server_unreachable), + NO_NETWORK(R.string.error_sync_no_network), TOKEN_MISMATCH(R.string.error_sync_token), ACCOUNT_REMOVED(R.string.error_sync_account_removed), UNKNOWN(R.string.error_synchronization); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 98607c728..bdfa1ab49 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -202,6 +202,7 @@ The server is in maintenance mode. Your changes will sync later. Your Nextcloud storage is full. Free up space to sync your changes. Could not reach your server. Check your connection and the Nextcloud Files app. + No network connection. Your changes will sync later. Notes lost access to your Nextcloud account. Grant access again to keep syncing. This account was removed from the Nextcloud Files app. Choose an account to keep syncing. No network connection From b1af761c1974b22a23047cb11e3993725d64db55 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Fri, 20 Nov 2026 10:57:44 +0100 Subject: [PATCH 10/14] consolidate branded snackbar usage in mainactivity for sync errors Signed-off-by: alperozturk96 --- .../java/it/niedermann/owncloud/notes/main/MainActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java index 317f4ca55..c3b54cbcb 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java @@ -868,7 +868,7 @@ public void onError(@NonNull Throwable t) { ApiProvider.getInstance().invalidateAPICache(ssoAccount); if (e instanceof UnknownErrorException && e.getMessage() != null && e.getMessage().contains("No address associated with hostname")) { // https://github.com/nextcloud/notes-android/issues/1014 - runOnUiThread(() -> Snackbar.make(coordinatorLayout, R.string.you_have_to_be_connected_to_the_internet_in_order_to_add_an_account, Snackbar.LENGTH_LONG) + runOnUiThread(() -> BrandedSnackbar.make(coordinatorLayout, R.string.you_have_to_be_connected_to_the_internet_in_order_to_add_an_account, Snackbar.LENGTH_LONG) .setAnchorView(binding.activityNotesListView.fabCreate) .show()); } else { From 9e1630fd290f6f0ff1522e3c8a0de548a190dd89 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Fri, 20 Nov 2026 10:59:20 +0100 Subject: [PATCH 11/14] update test Signed-off-by: alperozturk96 --- .../notes/persistence/NotesServerSyncTaskTest.java | 8 +++++--- .../owncloud/notes/persistence/NotesTestingUtil.java | 5 +++++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/src/test/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTaskTest.java b/app/src/test/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTaskTest.java index cdec2a693..6288649f2 100644 --- a/app/src/test/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTaskTest.java +++ b/app/src/test/java/it/niedermann/owncloud/notes/persistence/NotesServerSyncTaskTest.java @@ -18,9 +18,8 @@ import static it.niedermann.owncloud.notes.shared.model.DBStatus.LOCAL_FAVORITED; import static it.niedermann.owncloud.notes.shared.model.DBStatus.VOID; -import android.content.Context; - import androidx.arch.core.executor.testing.InstantTaskExecutorRule; +import androidx.test.core.app.ApplicationProvider; import com.nextcloud.android.sso.api.ParsedResponse; import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException; @@ -49,6 +48,8 @@ @Config(sdk = 36) public class NotesServerSyncTaskTest { + private static final String ACCOUNT_NAME = "test@example.com"; + @Rule public InstantTaskExecutorRule instantTaskExecutorRule = new InstantTaskExecutorRule(); @@ -61,9 +62,10 @@ public class NotesServerSyncTaskTest { @Before public void setup() throws NextcloudFilesAppAccountNotFoundException, IOException { + when(account.getAccountName()).thenReturn(ACCOUNT_NAME); when(apiProvider.getNotesAPI(any(), any(), any())).thenReturn(notesAPI); NotesTestingUtil.mockSingleSignOn(new SingleSignOnAccount(account.getAccountName(), account.getUserName(), "", account.getUrl(), "")); - this.task = new NotesServerSyncTask(mock(Context.class), repo, account, false, apiProvider) { + this.task = new NotesServerSyncTask(ApplicationProvider.getApplicationContext(), repo, account, false, apiProvider) { @Override void onPreExecute() { diff --git a/app/src/test/java/it/niedermann/owncloud/notes/persistence/NotesTestingUtil.java b/app/src/test/java/it/niedermann/owncloud/notes/persistence/NotesTestingUtil.java index 96585b2a2..d9696e500 100644 --- a/app/src/test/java/it/niedermann/owncloud/notes/persistence/NotesTestingUtil.java +++ b/app/src/test/java/it/niedermann/owncloud/notes/persistence/NotesTestingUtil.java @@ -6,6 +6,7 @@ */ package it.niedermann.owncloud.notes.persistence; +import android.accounts.AccountManager; import android.content.Context; import android.content.SharedPreferences; @@ -24,6 +25,7 @@ public class NotesTestingUtil { + private static final String FILES_APP_ACCOUNT_TYPE = "nextcloud"; private static long currentLong = 1; private NotesTestingUtil() { @@ -62,5 +64,8 @@ public static void mockSingleSignOn(@NonNull SingleSignOnAccount ssoAccount) thr final var sharedPrefs = ApplicationProvider.getApplicationContext().getSharedPreferences("TEMP_SHARED_PREFS_" + currentLong++, Context.MODE_PRIVATE); sharedPrefs.edit().putString("PREF_ACCOUNT_STRING" + ssoAccount.name, SingleSignOnAccount.toString(ssoAccount)).commit(); AccountImporter.setSharedPreferences(sharedPrefs); + + AccountManager.get(ApplicationProvider.getApplicationContext()) + .addAccountExplicitly(new android.accounts.Account(ssoAccount.name, FILES_APP_ACCOUNT_TYPE), null, null); } } From fe05b1cfb8591140caebaf91ead3cf928ccc8f2a Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Fri, 20 Nov 2026 11:26:04 +0100 Subject: [PATCH 12/14] fix snackbar line appereance, pull to refresh error handling Signed-off-by: alperozturk96 --- .../notes/branding/BrandedSnackbar.kt | 30 ++++++++++++++++++- .../owncloud/notes/main/MainActivity.java | 1 + .../notes/persistence/CapabilitiesClient.java | 1 + .../notes/persistence/FilesAppAccount.kt | 10 +++++-- .../persistence/CapabilitiesClientTest.java | 5 ++-- 5 files changed, 42 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedSnackbar.kt b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedSnackbar.kt index 428e5006d..2b15e5d66 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedSnackbar.kt +++ b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedSnackbar.kt @@ -18,9 +18,15 @@ import com.nextcloud.android.sso.helper.SingleAccountHelper import it.niedermann.owncloud.notes.R import it.niedermann.owncloud.notes.exception.ExceptionDialogFragment import it.niedermann.owncloud.notes.main.SyncErrorMessage +import it.niedermann.owncloud.notes.persistence.FilesAppAccount import it.niedermann.owncloud.notes.persistence.SyncFailureReason +import java.lang.ref.WeakReference object BrandedSnackbar { + private const val SYNC_ERROR_MAX_LINES = 4 + + private var syncErrorSnackbar: WeakReference? = null + @JvmStatic fun make( view: View, @@ -48,7 +54,10 @@ object BrandedSnackbar { @JvmStatic fun showSyncError(activity: FragmentActivity, view: View, anchor: View, exceptions: Collection) { val reason = SyncErrorMessage(exceptions).reasonOf() - val snackbar = make(view, reason.message, Snackbar.LENGTH_LONG) + if (reason == SyncFailureReason.ACCOUNT_REMOVED && isCurrentAccountAvailable(activity)) return + + val snackbar = make(view, reason.message, reason.snackbarDuration()) + .setTextMaxLines(SYNC_ERROR_MAX_LINES) .setAnchorView(anchor) when (reason) { SyncFailureReason.TOKEN_MISMATCH -> @@ -62,13 +71,32 @@ object BrandedSnackbar { else -> snackbar.setAction(R.string.simple_more) { showDetails(activity, exceptions) } } + syncErrorSnackbar = WeakReference(snackbar) snackbar.show() } + @JvmStatic + fun dismissSyncError() { + syncErrorSnackbar?.get()?.dismiss() + syncErrorSnackbar = null + } + @JvmStatic fun showSyncError(activity: FragmentActivity, view: View, anchor: View, exception: Throwable) = showSyncError(activity, view, anchor, listOf(exception)) + private fun SyncFailureReason.snackbarDuration(): Int = when (this) { + SyncFailureReason.TOKEN_MISMATCH, SyncFailureReason.ACCOUNT_REMOVED -> Snackbar.LENGTH_INDEFINITE + else -> Snackbar.LENGTH_LONG + } + + private fun isCurrentAccountAvailable(activity: FragmentActivity): Boolean = try { + FilesAppAccount.ensureExists(activity, SingleAccountHelper.getCurrentSingleSignOnAccount(activity).name) + true + } catch (e: SSOException) { + false + } + private fun requestAccessAgain(activity: FragmentActivity) { try { val ssoAccount = SingleAccountHelper.getCurrentSingleSignOnAccount(activity) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java index c3b54cbcb..c4f46a1fb 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java @@ -300,6 +300,7 @@ protected void onCreate(Bundle savedInstanceState) { }); mainViewModel.getNavigationCategories().observe(this, navigationItems -> this.adapterCategories.setItems(navigationItems)); mainViewModel.getCurrentAccount().observe(this, (nextAccount) -> { + BrandedSnackbar.dismissSyncError(); fabCreate.hide(); Glide .with(this) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/CapabilitiesClient.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/CapabilitiesClient.java index bd3d66027..96eed1d04 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/CapabilitiesClient.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/CapabilitiesClient.java @@ -33,6 +33,7 @@ public class CapabilitiesClient { @WorkerThread public static Capabilities getCapabilities(@NonNull Context context, @NonNull SingleSignOnAccount ssoAccount, @Nullable String lastETag, @NonNull ApiProvider apiProvider) throws Throwable { + FilesAppAccount.ensureExists(context, ssoAccount.name); final var ocsAPI = apiProvider.getOcsAPI(context, ssoAccount); try { final var response = ocsAPI.getCapabilities(lastETag).blockingSingle(); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/FilesAppAccount.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/FilesAppAccount.kt index acbede182..3887395bf 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/FilesAppAccount.kt +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/FilesAppAccount.kt @@ -15,10 +15,16 @@ object FilesAppAccount { @JvmStatic @Throws(NextcloudFilesAppAccountNotFoundException::class) fun require(context: Context, accountName: String): SingleSignOnAccount { + ensureExists(context, accountName) + + return AccountImporter.getSingleSignOnAccount(context, accountName) + } + + @JvmStatic + @Throws(NextcloudFilesAppAccountNotFoundException::class) + fun ensureExists(context: Context, accountName: String) { if (AccountImporter.getAccountForName(context, accountName) == null) { throw NextcloudFilesAppAccountNotFoundException(context, accountName) } - - return AccountImporter.getSingleSignOnAccount(context, accountName) } } diff --git a/app/src/test/java/it/niedermann/owncloud/notes/persistence/CapabilitiesClientTest.java b/app/src/test/java/it/niedermann/owncloud/notes/persistence/CapabilitiesClientTest.java index f32597ea9..1ecec30eb 100644 --- a/app/src/test/java/it/niedermann/owncloud/notes/persistence/CapabilitiesClientTest.java +++ b/app/src/test/java/it/niedermann/owncloud/notes/persistence/CapabilitiesClientTest.java @@ -46,13 +46,14 @@ public class CapabilitiesClientTest { @Rule public InstantTaskExecutorRule instantTaskExecutorRule = new InstantTaskExecutorRule(); - private final SingleSignOnAccount ssoAccount = mock(SingleSignOnAccount.class); + private final SingleSignOnAccount ssoAccount = new SingleSignOnAccount("test@example.com", "test", "", "https://example.com", ""); private final ApiProvider apiProvider = mock(ApiProvider.class); private final OcsAPI ocsAPI = mock(OcsAPI.class); @Before - public void setup() { + public void setup() throws IOException { when(apiProvider.getOcsAPI(any(), any())).thenReturn(ocsAPI); + NotesTestingUtil.mockSingleSignOn(ssoAccount); } @Test From c6c5b42527a2832cd142ed6c263c6c13ce2ac0a4 Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Fri, 20 Nov 2026 11:30:51 +0100 Subject: [PATCH 13/14] fix snackbar line appereance, pull to refresh error handling Signed-off-by: alperozturk96 --- .../owncloud/notes/branding/BrandedSnackbar.kt | 12 +++++------- .../niedermann/owncloud/notes/main/MainActivity.java | 2 +- .../owncloud/notes/persistence/FilesAppAccount.kt | 5 ++++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedSnackbar.kt b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedSnackbar.kt index 2b15e5d66..9504c8df5 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedSnackbar.kt +++ b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedSnackbar.kt @@ -26,6 +26,7 @@ object BrandedSnackbar { private const val SYNC_ERROR_MAX_LINES = 4 private var syncErrorSnackbar: WeakReference? = null + private var currentAccountName: String? = null @JvmStatic fun make( @@ -76,7 +77,8 @@ object BrandedSnackbar { } @JvmStatic - fun dismissSyncError() { + fun onCurrentAccountChanged(accountName: String) { + currentAccountName = accountName syncErrorSnackbar?.get()?.dismiss() syncErrorSnackbar = null } @@ -90,12 +92,8 @@ object BrandedSnackbar { else -> Snackbar.LENGTH_LONG } - private fun isCurrentAccountAvailable(activity: FragmentActivity): Boolean = try { - FilesAppAccount.ensureExists(activity, SingleAccountHelper.getCurrentSingleSignOnAccount(activity).name) - true - } catch (e: SSOException) { - false - } + private fun isCurrentAccountAvailable(activity: FragmentActivity): Boolean = + currentAccountName?.let { FilesAppAccount.exists(activity, it) } == true private fun requestAccessAgain(activity: FragmentActivity) { try { diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java index c4f46a1fb..6e3ae1037 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java @@ -300,7 +300,7 @@ protected void onCreate(Bundle savedInstanceState) { }); mainViewModel.getNavigationCategories().observe(this, navigationItems -> this.adapterCategories.setItems(navigationItems)); mainViewModel.getCurrentAccount().observe(this, (nextAccount) -> { - BrandedSnackbar.dismissSyncError(); + BrandedSnackbar.onCurrentAccountChanged(nextAccount.getAccountName()); fabCreate.hide(); Glide .with(this) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/FilesAppAccount.kt b/app/src/main/java/it/niedermann/owncloud/notes/persistence/FilesAppAccount.kt index 3887395bf..f93aa4a1b 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/FilesAppAccount.kt +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/FilesAppAccount.kt @@ -23,8 +23,11 @@ object FilesAppAccount { @JvmStatic @Throws(NextcloudFilesAppAccountNotFoundException::class) fun ensureExists(context: Context, accountName: String) { - if (AccountImporter.getAccountForName(context, accountName) == null) { + if (!exists(context, accountName)) { throw NextcloudFilesAppAccountNotFoundException(context, accountName) } } + + fun exists(context: Context, accountName: String): Boolean = + AccountImporter.getAccountForName(context, accountName) != null } From 9a3fc12f84f7f0d1d38f32b0a322aae6d4e793bf Mon Sep 17 00:00:00 2001 From: alperozturk96 Date: Fri, 20 Nov 2026 16:00:25 +0100 Subject: [PATCH 14/14] show username in snackbar for remove Signed-off-by: alperozturk96 --- .../owncloud/notes/branding/BrandedSnackbar.kt | 17 ++++++++++++----- .../owncloud/notes/main/MainActivity.java | 2 +- app/src/main/res/values/strings.xml | 2 +- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedSnackbar.kt b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedSnackbar.kt index 9504c8df5..22ca6e4bf 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedSnackbar.kt +++ b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedSnackbar.kt @@ -6,6 +6,7 @@ */ package it.niedermann.owncloud.notes.branding +import android.content.Context import android.view.View import androidx.annotation.ColorInt import androidx.annotation.StringRes @@ -20,13 +21,14 @@ import it.niedermann.owncloud.notes.exception.ExceptionDialogFragment import it.niedermann.owncloud.notes.main.SyncErrorMessage import it.niedermann.owncloud.notes.persistence.FilesAppAccount import it.niedermann.owncloud.notes.persistence.SyncFailureReason +import it.niedermann.owncloud.notes.persistence.entity.Account import java.lang.ref.WeakReference object BrandedSnackbar { private const val SYNC_ERROR_MAX_LINES = 4 private var syncErrorSnackbar: WeakReference? = null - private var currentAccountName: String? = null + private var currentAccount: Account? = null @JvmStatic fun make( @@ -57,7 +59,7 @@ object BrandedSnackbar { val reason = SyncErrorMessage(exceptions).reasonOf() if (reason == SyncFailureReason.ACCOUNT_REMOVED && isCurrentAccountAvailable(activity)) return - val snackbar = make(view, reason.message, reason.snackbarDuration()) + val snackbar = make(view, reason.text(view.context), reason.snackbarDuration()) .setTextMaxLines(SYNC_ERROR_MAX_LINES) .setAnchorView(anchor) when (reason) { @@ -77,8 +79,8 @@ object BrandedSnackbar { } @JvmStatic - fun onCurrentAccountChanged(accountName: String) { - currentAccountName = accountName + fun onCurrentAccountChanged(account: Account) { + currentAccount = account syncErrorSnackbar?.get()?.dismiss() syncErrorSnackbar = null } @@ -87,13 +89,18 @@ object BrandedSnackbar { fun showSyncError(activity: FragmentActivity, view: View, anchor: View, exception: Throwable) = showSyncError(activity, view, anchor, listOf(exception)) + private fun SyncFailureReason.text(context: Context): CharSequence = when (this) { + SyncFailureReason.ACCOUNT_REMOVED -> context.getString(message, currentAccount?.userName) + else -> context.getText(message) + } + private fun SyncFailureReason.snackbarDuration(): Int = when (this) { SyncFailureReason.TOKEN_MISMATCH, SyncFailureReason.ACCOUNT_REMOVED -> Snackbar.LENGTH_INDEFINITE else -> Snackbar.LENGTH_LONG } private fun isCurrentAccountAvailable(activity: FragmentActivity): Boolean = - currentAccountName?.let { FilesAppAccount.exists(activity, it) } == true + currentAccount?.let { FilesAppAccount.exists(activity, it.accountName) } == true private fun requestAccessAgain(activity: FragmentActivity) { try { diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java index 6e3ae1037..29acfdda7 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java @@ -300,7 +300,7 @@ protected void onCreate(Bundle savedInstanceState) { }); mainViewModel.getNavigationCategories().observe(this, navigationItems -> this.adapterCategories.setItems(navigationItems)); mainViewModel.getCurrentAccount().observe(this, (nextAccount) -> { - BrandedSnackbar.onCurrentAccountChanged(nextAccount.getAccountName()); + BrandedSnackbar.onCurrentAccountChanged(nextAccount); fabCreate.hide(); Glide .with(this) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bdfa1ab49..a29b130b5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -204,7 +204,7 @@ Could not reach your server. Check your connection and the Nextcloud Files app. No network connection. Your changes will sync later. Notes lost access to your Nextcloud account. Grant access again to keep syncing. - This account was removed from the Nextcloud Files app. Choose an account to keep syncing. + This account was removed from the Nextcloud Files app. Log in again with the same account (%1$s) to keep syncing. No network connection Server is in maintenance mode An unknown error has occurred.