Minor refactorings

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

2 files changed, 16 insertions, 21 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java
index f2f1afa33..03f782257 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java
@@ -326,12 +326,13 @@ public class SyncManager {
                 }
                 // TODO: throw this shit away
                 // thats why we do this: https://github.com/nextcloud/deck/issues/3229
-                fuckYouYouFuckingFuckFuck(new ResponseCallback<>(account) {
+                serverAdapter.getBoards(new ResponseCallback<>(account) {
                     @Override
                     public void onResponse(ParsedResponse<List<FullBoard>> response) {
                       callback.onResponse(createdAccount);
                     }
 
+                    @SuppressLint("MissingSuperCall")
                     @Override
                     public void onError(Throwable throwable) {
                       callback.onResponse(createdAccount);
@@ -345,14 +346,6 @@ public class SyncManager {
         });
     }
 
-    /**
-     * https://github.com/nextcloud/deck/issues/3229
-     * @param callback
-     */
-    private void fuckYouYouFuckingFuckFuck(ResponseCallback<ParsedResponse<List<FullBoard>>> callback) {
-        serverAdapter.getBoards(callback);
-    }
-
     public boolean hasInternetConnection() {
         return serverAdapter.hasInternetConnection();
     }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/ImportAccountActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/ImportAccountActivity.java
index 79824e1a3..d3a70ff6c 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/ImportAccountActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/ImportAccountActivity.java
@@ -113,16 +113,17 @@ public class ImportAccountActivity extends AppCompatActivity {
                         });
 
                         SingleAccountHelper.setCurrentAccount(getApplicationContext(), account.name);
-                        SyncManager syncManager = new SyncManager(ImportAccountActivity.this);
-                        final Account accountToCreate = new Account(account.name, account.userId, account.url);
+                        final var syncManager = new SyncManager(ImportAccountActivity.this);
+                        final var accountToCreate = new Account(account.name, account.userId, account.url);
                         syncManager.createAccount(accountToCreate, new IResponseCallback<>() {
                             @Override
                             public void onResponse(Account createdAccount) {
                                 // Remember last account - THIS HAS TO BE DONE SYNCHRONOUSLY
-                                final SharedPreferences.Editor editor = sharedPreferences.edit();
                                 DeckLog.log("--- Write: shared_preference_last_account | ", createdAccount.getId());
-                                editor.putLong(sharedPreferenceLastAccount, createdAccount.getId());
-                                editor.commit();
+                                sharedPreferences
+                                        .edit()
+                                        .putLong(sharedPreferenceLastAccount, createdAccount.getId())
+                                        .commit();
 
                                 syncManager.refreshCapabilities(new ResponseCallback<>(createdAccount) {
                                     @Override
@@ -229,18 +230,19 @@ public class ImportAccountActivity extends AppCompatActivity {
 
     @SuppressLint("ApplySharedPref")
     private void disableWifiPref() {
-        SharedPreferences.Editor editor = sharedPreferences.edit();
         DeckLog.info("--- Temporarily disable sync on wifi only setting");
-        editor.putBoolean(prefKeyWifiOnly, false);
-        editor.commit();
-
+        sharedPreferences
+                .edit()
+                .putBoolean(prefKeyWifiOnly, false)
+                .commit();
     }
 
     private void restoreWifiPref() {
-        SharedPreferences.Editor editor = sharedPreferences.edit();
         DeckLog.info("--- Restoring sync on wifi only setting");
-        editor.putBoolean(prefKeyWifiOnly, originalWifiOnlyValue);
-        editor.apply();
+        sharedPreferences
+                .edit()
+                .putBoolean(prefKeyWifiOnly, originalWifiOnlyValue)
+                .apply();
     }
 
     public static Intent createIntent(@NonNull Context context) {