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.java deleted file mode 100644 index def4950e6..000000000 --- a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedSnackbar.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Nextcloud Notes - Android Client - * - * SPDX-FileCopyrightText: 2020-2024 Nextcloud GmbH and Nextcloud contributors - * SPDX-License-Identifier: GPL-3.0-or-later - */ -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.NonNull; -import androidx.annotation.StringRes; - -import com.google.android.material.snackbar.BaseTransientBottomBar; -import com.google.android.material.snackbar.Snackbar; - -public class BrandedSnackbar { - - @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()); - - utils.material.themeSnackbar(snackbar); - - return snackbar; - } - - @NonNull - public static Snackbar make(@NonNull View view, @StringRes int resId, @BaseTransientBottomBar.Duration int duration) { - return make(view, view.getResources().getText(resId), duration); - } -} \ No newline at end of file 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 new file mode 100644 index 000000000..22ca6e4bf --- /dev/null +++ b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedSnackbar.kt @@ -0,0 +1,126 @@ +/* + * Nextcloud - Android Client + * + * SPDX-FileCopyrightText: 2026 Alper Ozturk + * SPDX-License-Identifier: AGPL-3.0-or-later + */ +package it.niedermann.owncloud.notes.branding + +import android.content.Context +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.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 currentAccount: Account? = null + + @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) + + utils.material.themeSnackbar(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() + if (reason == SyncFailureReason.ACCOUNT_REMOVED && isCurrentAccountAvailable(activity)) return + + val snackbar = make(view, reason.text(view.context), reason.snackbarDuration()) + .setTextMaxLines(SYNC_ERROR_MAX_LINES) + .setAnchorView(anchor) + 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) } + + SyncFailureReason.NO_NETWORK, SyncFailureReason.MAINTENANCE -> Unit + + else -> snackbar.setAction(R.string.simple_more) { showDetails(activity, exceptions) } + } + + syncErrorSnackbar = WeakReference(snackbar) + snackbar.show() + } + + @JvmStatic + fun onCurrentAccountChanged(account: Account) { + currentAccount = account + 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.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 = + currentAccount?.let { FilesAppAccount.exists(activity, it.accountName) } == true + + private fun requestAccessAgain(activity: FragmentActivity) { + try { + val ssoAccount = SingleAccountHelper.getCurrentSingleSignOnAccount(activity) + AccountImporter.authenticateSingleSignAccount(activity, ssoAccount) + } catch (e: SSOException) { + showDetails(activity, listOf(e)) + } + } + + 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/main/MainActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainActivity.java index 1a677efcb..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 @@ -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,16 +70,13 @@ 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.TokenMismatchException; import com.nextcloud.android.sso.exceptions.UnknownErrorException; import com.nextcloud.android.sso.helper.SingleAccountHelper; import com.owncloud.android.lib.common.utils.Log_OC; import org.jetbrains.annotations.NotNull; -import java.net.HttpURLConnection; import java.util.LinkedList; import java.util.List; import java.util.Objects; @@ -169,6 +165,7 @@ public class MainActivity extends LockedActivity implements NoteClickListener, A boolean canMoveNoteToAnotherAccounts = false; + @Override protected void onCreate(Bundle savedInstanceState) { SplashScreen.installSplashScreen(this); @@ -223,11 +220,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(); + BrandedSnackbar.showSyncError(this, coordinatorLayout, fabCreate, exceptions); } }); mainViewModel.getSelectedCategory().observe(this, (selectedCategory) -> { @@ -307,6 +300,7 @@ protected void onCreate(Bundle savedInstanceState) { }); mainViewModel.getNavigationCategories().observe(this, navigationItems -> this.adapterCategories.setItems(navigationItems)); mainViewModel.getCurrentAccount().observe(this, (nextAccount) -> { + BrandedSnackbar.onCurrentAccountChanged(nextAccount); fabCreate.hide(); Glide .with(this) @@ -327,17 +321,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.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(); + return; } + + BrandedSnackbar.showSyncError(MainActivity.this, coordinatorLayout, fabCreate, t); }); } }); @@ -618,21 +605,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.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(); + return; } + + BrandedSnackbar.showSyncError(MainActivity.this, coordinatorLayout, fabCreate, t); }); } }); @@ -840,8 +816,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,19 +867,9 @@ 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) + 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 { 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..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,23 +6,18 @@ */ package it.niedermann.owncloud.notes.main -import androidx.annotation.StringRes +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 import com.nextcloud.android.sso.exceptions.NextcloudNetworkException import com.nextcloud.android.sso.exceptions.TokenMismatchException 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 - - @JvmStatic - @StringRes - fun of(exception: Throwable): Int = exception.syncFailureReason().message +class SyncErrorMessage(private val exceptions: Collection) { + fun reasonOf(): SyncFailureReason = + exceptions.map { it.syncFailureReason() }.distinct().singleOrNull() ?: SyncFailureReason.UNKNOWN private fun Throwable.syncFailureReason(): SyncFailureReason = generateSequence(this) { it.cause }.firstNotNullOfOrNull { it.directSyncFailureReason() } @@ -33,6 +28,8 @@ object SyncErrorMessage { is NextcloudHttpRequestFailedException -> SyncFailureReason.fromStatusCode(statusCode) 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/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 new file mode 100644 index 000000000..f93aa4a1b --- /dev/null +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/FilesAppAccount.kt @@ -0,0 +1,33 @@ +/* + * Nextcloud - Android Client + * + * SPDX-FileCopyrightText: 2026 Alper Ozturk + * 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 { + ensureExists(context, accountName) + + return AccountImporter.getSingleSignOnAccount(context, accountName) + } + + @JvmStatic + @Throws(NextcloudFilesAppAccountNotFoundException::class) + fun ensureExists(context: Context, accountName: String) { + if (!exists(context, accountName)) { + throw NextcloudFilesAppAccountNotFoundException(context, accountName) + } + } + + fun exists(context: Context, accountName: String): Boolean = + AccountImporter.getAccountForName(context, accountName) != null +} 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/NotesRepository.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/NotesRepository.java index 70f06b18f..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 @@ -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 -> { @@ -887,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) { @@ -937,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 087b03cfc..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; } @@ -138,7 +137,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..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,7 +23,9 @@ 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), + 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); companion object { @@ -31,7 +33,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 +41,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/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) + } +} diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6921a793f..a29b130b5 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -202,7 +202,9 @@ 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. + 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. 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. @@ -325,7 +327,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 +472,7 @@ Open App info Network settings Update + Grant access No account configured yet You don\'t have configured any other accounts yet. Choose account 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 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); } } 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 @@ + + + + + + + +