chore(deps): AGP 8, Java 17, Kotlin 1.9.22, SSO 1.0.0

Signed-off-by: Stefan Niedermann <info@niedermann.it>

11 files changed, 16 insertions, 17 deletions

diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.java
index 113db2a9..a3f55c24 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedActivity.java
@@ -20,7 +20,7 @@ public abstract class BrandedActivity extends AppCompatActivity implements Brand
         super.onStart();
 
         final var typedValue = new TypedValue();
-        getTheme().resolveAttribute(R.attr.colorAccent, typedValue, true);
+        getTheme().resolveAttribute(com.google.android.material.R.attr.colorAccent, typedValue, true);
         colorAccent = typedValue.data;
 
         readBrandMainColorLiveData(this).observe(this, this::applyBrand);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedFragment.java
index ac197ef8..bed27575 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/branding/BrandedFragment.java
@@ -23,9 +23,9 @@ public abstract class BrandedFragment extends Fragment implements Branded {
 
         final var context = requireContext();
         final var typedValue = new TypedValue();
-        context.getTheme().resolveAttribute(R.attr.colorAccent, typedValue, true);
+        context.getTheme().resolveAttribute(com.google.android.material.R.attr.colorAccent, typedValue, true);
         colorAccent = typedValue.data;
-        context.getTheme().resolveAttribute(R.attr.colorPrimary, typedValue, true);
+        context.getTheme().resolveAttribute(com.google.android.material.R.attr.colorPrimary, typedValue, true);
         colorPrimary = typedValue.data;
 
         @ColorInt final int color = BrandingUtil.readBrandMainColor(context);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java
index 16245433..1d6adc0e 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/edit/BaseNoteFragment.java
@@ -103,7 +103,7 @@ public abstract class BaseNoteFragment extends BrandedFragment implements Catego
                         if (accountId > 0) {
                             /* Switch account if account id has been provided */
                             this.localAccount = repo.getAccountById(accountId);
-                            SingleAccountHelper.setCurrentAccount(requireContext().getApplicationContext(), localAccount.getAccountName());
+                            SingleAccountHelper.commitCurrentAccount(requireContext().getApplicationContext(), localAccount.getAccountName());
                         }
                         isNew = false;
                         note = originalNote = repo.getNoteById(id);
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java
index 71b43db5..2b49cc29 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/edit/EditNoteActivity.java
@@ -71,7 +71,7 @@ public class EditNoteActivity extends LockedActivity implements BaseNoteFragment
 
         try {
             if (SingleAccountHelper.getCurrentSingleSignOnAccount(this) == null) {
-                throw new NoCurrentAccountSelectedException();
+                throw new NoCurrentAccountSelectedException(this);
             }
         } catch (NextcloudFilesAppAccountNotFoundException | NoCurrentAccountSelectedException e) {
             Toast.makeText(this, R.string.no_account_configured_yet, Toast.LENGTH_LONG).show();
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/edit/SearchableBaseNoteFragment.java b/app/src/main/java/it/niedermann/owncloud/notes/edit/SearchableBaseNoteFragment.java
index 10c9510c..1ca1c5f5 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/edit/SearchableBaseNoteFragment.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/edit/SearchableBaseNoteFragment.java
@@ -117,8 +117,7 @@ public abstract class SearchableBaseNoteFragment extends BaseNoteFragment {
 
         searchMenuItem.collapseActionView();
 
-        final var searchEditFrame = searchView.findViewById(R.id
-                .search_edit_frame);
+        final var searchEditFrame = searchView.findViewById(androidx.appcompat.R.id.search_edit_frame);
 
         searchEditFrame.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
             int oldVisibility = -1;
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/importaccount/ImportAccountActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/importaccount/ImportAccountActivity.java
index 72ec0c26..c4e58079 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/importaccount/ImportAccountActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/importaccount/ImportAccountActivity.java
@@ -88,7 +88,7 @@ public class ImportAccountActivity extends AppCompatActivity {
             AccountImporter.onActivityResult(requestCode, resultCode, data, ImportAccountActivity.this, ssoAccount -> {
                 runOnUiThread(() -> binding.progressCircular.setVisibility(View.VISIBLE));
 
-                SingleAccountHelper.setCurrentAccount(getApplicationContext(), ssoAccount.name);
+                SingleAccountHelper.commitCurrentAccount(getApplicationContext(), ssoAccount.name);
                 executor.submit(() -> {
                     Log.i(TAG, "Added account: " + "name:" + ssoAccount.name + ", " + ssoAccount.url + ", userId" + ssoAccount.userId);
                     try {
@@ -135,7 +135,7 @@ public class ImportAccountActivity extends AppCompatActivity {
                     } catch (Throwable t) {
                         t.printStackTrace();
                         ApiProvider.getInstance().invalidateAPICache(ssoAccount);
-                        SingleAccountHelper.setCurrentAccount(this, null);
+                        SingleAccountHelper.commitCurrentAccount(this, null);
                         runOnUiThread(() -> {
                             restoreCleanState();
                             if (t instanceof NextcloudHttpRequestFailedException && ((NextcloudHttpRequestFailedException) t).getStatusCode() == HttpURLConnection.HTTP_UNAVAILABLE) {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java
index 75d02c52..ec725444 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MainViewModel.java
@@ -121,7 +121,7 @@ public class MainViewModel extends AndroidViewModel {
     public void postCurrentAccount(@NonNull Account account) {
         state.set(KEY_CURRENT_ACCOUNT, account);
         BrandingUtil.saveBrandColor(getApplication(), account.getColor());
-        SingleAccountHelper.setCurrentAccount(getApplication(), account.getAccountName());
+        SingleAccountHelper.commitCurrentAccount(getApplication(), account.getAccountName());
 
         final var currentAccount = this.currentAccount.getValue();
         // If only ETag or colors change, we must not reset the navigation
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java b/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java
index 194dcbc8..6caf4f22 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/main/MultiSelectedActionModeCallback.java
@@ -72,7 +72,7 @@ public class MultiSelectedActionModeCallback implements Callback {
         this.fragmentManager = fragmentManager;
 
         final TypedValue typedValue = new TypedValue();
-        context.getTheme().resolveAttribute(R.attr.colorAccent, typedValue, true);
+        context.getTheme().resolveAttribute(com.google.android.material.R.attr.colorAccent, typedValue, true);
         colorAccent = typedValue.data;
     }
 
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsViewModel.java b/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsViewModel.java
index b625b076..6cbc199d 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsViewModel.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/manageaccounts/ManageAccountsViewModel.java
@@ -66,7 +66,7 @@ public class ManageAccountsViewModel extends AndroidViewModel {
     }
 
     public void selectAccount(@Nullable Account account, @NonNull Context context) {
-        SingleAccountHelper.setCurrentAccount(context, (account == null) ? null : account.getAccountName());
+        SingleAccountHelper.commitCurrentAccount(context, (account == null) ? null : account.getAccountName());
     }
 
     public void countUnsynchronizedNotes(long accountId, @NonNull IResponseCallback<Long> callback) {
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiProvider.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiProvider.java
index 4be0a493..bd1ae4eb 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiProvider.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/ApiProvider.java
@@ -124,7 +124,7 @@ public class ApiProvider {
         if (API_CACHE.containsKey(ssoAccount.name)) {
             final var nextcloudAPI = API_CACHE.get(ssoAccount.name);
             if (nextcloudAPI != null) {
-                nextcloudAPI.stop();
+                nextcloudAPI.close();
             }
             API_CACHE.remove(ssoAccount.name);
         }
@@ -141,7 +141,7 @@ public class ApiProvider {
             if (API_CACHE.containsKey(key)) {
                 final var nextcloudAPI = API_CACHE.get(key);
                 if (nextcloudAPI != null) {
-                    nextcloudAPI.stop();
+                    nextcloudAPI.close();
                 }
                 API_CACHE.remove(key);
             }
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 1ea2f7cb..74589cbc 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
@@ -187,7 +187,7 @@ public class NotesRepository {
                         public void onError(@NonNull Throwable t) {
                             Log.e(TAG, "… Error while importing " + account.getAccountName() + ": " + t.getMessage());
                             deleteAccount(account);
-                            SingleAccountHelper.setCurrentAccount(context, null);
+                            SingleAccountHelper.commitCurrentAccount(context, null);
                             callback.onError(t);
                         }
                     });
@@ -195,7 +195,7 @@ public class NotesRepository {
                     Log.e(TAG, "… Could not find " + SingleSignOnAccount.class.getSimpleName() + " for account name " + account.getAccountName());
                     importExecutor.submit(() -> {
                         deleteAccount(account);
-                        SingleAccountHelper.setCurrentAccount(context, null);
+                        SingleAccountHelper.commitCurrentAccount(context, null);
                         callback.onError(e);
                     });
                 }
@@ -203,7 +203,7 @@ public class NotesRepository {
                 Log.e(TAG, "… No network connection available to import " + account.getAccountName());
                 importExecutor.submit(() -> {
                     deleteAccount(account);
-                    SingleAccountHelper.setCurrentAccount(context, null);
+                    SingleAccountHelper.commitCurrentAccount(context, null);
                     callback.onError(new NetworkErrorException());
                 });
             }