refactor: Make literals configurable

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

3 files changed, 26 insertions, 29 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/DeckLog.java b/app/src/main/java/it/niedermann/nextcloud/deck/DeckLog.java
index fadc55c3f..d8fd475a3 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/DeckLog.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/DeckLog.java
@@ -40,7 +40,7 @@ public class DeckLog {
     }
 
     public static String getStacktraceAsString(Throwable e) {
-        StringWriter sw = new StringWriter();
+        final var sw = new StringWriter();
         e.printStackTrace(new PrintWriter(sw));
         return sw.toString();
     }
@@ -93,24 +93,12 @@ public class DeckLog {
                     .append("\n");
         }
         switch (severity) {
-            case DEBUG:
-                Log.d(TAG, print);
-                break;
-            case INFO:
-                Log.i(TAG, print);
-                break;
-            case WARN:
-                Log.w(TAG, print);
-                break;
-            case ERROR:
-                Log.e(TAG, print);
-                break;
-            case WTF:
-                Log.wtf(TAG, print);
-                break;
-            default:
-                Log.v(TAG, print);
-                break;
+            case DEBUG -> Log.d(TAG, print);
+            case INFO -> Log.i(TAG, print);
+            case WARN -> Log.w(TAG, print);
+            case ERROR -> Log.e(TAG, print);
+            case WTF -> Log.wtf(TAG, print);
+            default -> Log.v(TAG, print);
         }
     }
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/SyncHelper.java b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/SyncHelper.java
index 1c5c63ada..8f2697523 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/SyncHelper.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/remote/helpers/SyncHelper.java
@@ -70,7 +70,7 @@ public class SyncHelper {
 
                         if (existingEntity == null) {
                             try {
-                                ExecutorServiceProvider.awaitExectuion(() -> provider.createInDB(dataBaseAdapter, accountId, entityFromServer));
+                                ExecutorServiceProvider.awaitExecution(() -> provider.createInDB(dataBaseAdapter, accountId, entityFromServer));
                             } catch (SQLiteConstraintException e) {
                                 provider.onInsertFailed(dataBaseAdapter, e, account, accountId, response, entityFromServer);
                                 throw new RuntimeException("ConstraintViolation! Entity: " + provider.getClass().getSimpleName()+"\n"
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/util/ExecutorServiceProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/util/ExecutorServiceProvider.java
index 2036b2845..a307f19c3 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/util/ExecutorServiceProvider.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/util/ExecutorServiceProvider.java
@@ -1,5 +1,7 @@
 package it.niedermann.nextcloud.deck.util;
 
+import androidx.annotation.NonNull;
+
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
@@ -29,26 +31,33 @@ public class ExecutorServiceProvider {
         return EXECUTOR;
     }
 
-    public static void awaitExectuion(Runnable r) {
-        CountDownLatch l = new CountDownLatch(1);
+    public static void awaitExecution(@NonNull Runnable runnable) {
+        final var latch = new CountDownLatch(1);
         EXECUTOR.submit(() -> {
-            r.run();
-            l.countDown();
+            runnable.run();
+            latch.countDown();
         });
         try {
-            l.await();
+            latch.await();
         } catch (Throwable e) {
             DeckLog.error(e);
         }
     }
 
     private static class RetryableRunnable implements Runnable {
-        private static final int MAX_RETRIES = 5;
+        private final int maxRetries;
+        @NonNull
         private final Runnable runnable;
-        private int retriesLeft = MAX_RETRIES;
+        private int retriesLeft;
+
+        public RetryableRunnable(@NonNull Runnable runnable) {
+            this(runnable, 5);
+        }
 
-        public RetryableRunnable(Runnable runnable) {
+        public RetryableRunnable(@NonNull Runnable runnable, int maxRetries) {
             this.runnable = runnable;
+            this.maxRetries = maxRetries;
+            this.retriesLeft = maxRetries;
         }
 
         @Override
@@ -57,7 +66,7 @@ public class ExecutorServiceProvider {
                 runnable.run();
             } catch (Exception e) {
                 if (retriesLeft < 1) {
-                    DeckLog.error("Error executing task, already retried", MAX_RETRIES, " times, giving up. Error causing this:", DeckLog.getStacktraceAsString(e));
+                    DeckLog.error("Error executing task, already retried", maxRetries, " times, giving up. Error causing this:", DeckLog.getStacktraceAsString(e));
                     throw e;
                 }
                 DeckLog.error("Error executing task, retrying for", retriesLeft, " more times. Error causing this:", DeckLog.getStacktraceAsString(e));