Allow to pass Object... to DeckLog

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

40 files changed, 146 insertions, 145 deletions

diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/DeckApplication.java b/app/src/main/java/it/niedermann/nextcloud/deck/DeckApplication.java
index 7a735833e..cfa462787 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/DeckApplication.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/DeckApplication.java
@@ -54,7 +54,7 @@ public class DeckApplication extends MultiDexApplication {
     public static boolean isPersistentLoggingEnabled(@NonNull Context context) {
         final SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
         boolean enabled = sharedPreferences.getBoolean(PREF_KEY_DEBUGGING, false);
-        DeckLog.log("--- Read: " + PREF_KEY_DEBUGGING + " | " + enabled);
+        DeckLog.log("--- Read:", PREF_KEY_DEBUGGING, "|", enabled);
         return enabled;
     }
 
@@ -101,9 +101,9 @@ public class DeckApplication extends MultiDexApplication {
 
     public static void saveCurrentAccount(@NonNull Context context, @NonNull Account account) {
         SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        DeckLog.log("--- Write: shared_preference_last_account" + " | " + account.getId());
+        DeckLog.log("--- Write: shared_preference_last_account |", account.getId());
         editor.putLong(context.getString(R.string.shared_preference_last_account), account.getId());
-        DeckLog.log("--- Write: shared_preference_last_account_color" + " | " + account.getColor());
+        DeckLog.log("--- Write: shared_preference_last_account_color | ", account.getColor());
         editor.putInt(context.getString(R.string.shared_preference_last_account_color), account.getColor());
         editor.apply();
     }
@@ -122,13 +122,13 @@ public class DeckApplication extends MultiDexApplication {
     public static long readCurrentAccountId(@NonNull Context context) {
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
         long accountId = sharedPreferences.getLong(context.getString(R.string.shared_preference_last_account), NO_ACCOUNT_ID);
-        DeckLog.log("--- Read: shared_preference_last_account" + " | " + accountId);
+        DeckLog.log("--- Read: shared_preference_last_account |", accountId);
         return accountId;
     }
 
     public static void saveCurrentBoardId(@NonNull Context context, long accountId, long boardId) {
         SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        DeckLog.log("--- Write: shared_preference_last_board_for_account_" + accountId + " | " + boardId);
+        DeckLog.log("--- Write: shared_preference_last_board_for_account_" + accountId, "|", boardId);
         editor.putLong(context.getString(R.string.shared_preference_last_board_for_account_) + accountId, boardId);
         editor.apply();
     }
@@ -136,13 +136,13 @@ public class DeckApplication extends MultiDexApplication {
     public static long readCurrentBoardId(@NonNull Context context, long accountId) {
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
         long boardId = sharedPreferences.getLong(context.getString(R.string.shared_preference_last_board_for_account_) + accountId, NO_BOARD_ID);
-        DeckLog.log("--- Read: shared_preference_last_board_for_account_" + accountId + " | " + boardId);
+        DeckLog.log("--- Read: shared_preference_last_board_for_account_" + accountId, "|", boardId);
         return boardId;
     }
 
     public static void saveCurrentStackId(@NonNull Context context, long accountId, long boardId, long stackId) {
         SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        DeckLog.log("--- Write: shared_preference_last_stack_for_account_and_board_" + accountId + "_" + boardId + " | " + stackId);
+        DeckLog.log("--- Write: shared_preference_last_stack_for_account_and_board_" + accountId + "_" + boardId, "|", stackId);
         editor.putLong(context.getString(R.string.shared_preference_last_stack_for_account_and_board_) + accountId + "_" + boardId, stackId);
         editor.apply();
     }
@@ -150,7 +150,7 @@ public class DeckApplication extends MultiDexApplication {
     public static long readCurrentStackId(@NonNull Context context, long accountId, long boardId) {
         SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
         long savedStackId = sharedPreferences.getLong(context.getString(R.string.shared_preference_last_stack_for_account_and_board_) + accountId + "_" + boardId, NO_STACK_ID);
-        DeckLog.log("--- Read: shared_preference_last_stack_for_account_and_board" + accountId + "_" + boardId + " | " + savedStackId);
+        DeckLog.log("--- Read: shared_preference_last_stack_for_account_and_board" + accountId + "_" + boardId, "|", savedStackId);
         return savedStackId;
     }
 }
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 1d7e13385..752e2c798 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/DeckLog.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/DeckLog.java
@@ -2,6 +2,7 @@ package it.niedermann.nextcloud.deck;
 
 import android.content.Context;
 import android.content.Intent;
+import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
 
@@ -34,36 +35,36 @@ public class DeckLog {
         VERBOSE, DEBUG, LOG, INFO, WARN, ERROR
     }
 
-    public static void verbose(String message) {
-        log(message, Severity.VERBOSE, 4);
+    public static void verbose(Object... message) {
+        log(Severity.VERBOSE, 4, message);
     }
 
-    public static void log(String message) {
-        log(message, Severity.DEBUG, 4);
+    public static void log(Object... message) {
+        log(Severity.DEBUG, 4, message);
     }
 
-    public static void info(String message) {
-        log(message, Severity.INFO, 4);
+    public static void info(Object... message) {
+        log(Severity.INFO, 4, message);
     }
 
-    public static void warn(String message) {
-        log(message, Severity.WARN, 4);
+    public static void warn(Object... message) {
+        log(Severity.WARN, 4, message);
     }
 
-    public static void error(String message) {
-        log(message, Severity.ERROR, 4);
+    public static void error(Object... message) {
+        log(Severity.ERROR, 4, message);
     }
 
-    public static void log(String message, Severity severity) {
-        log(message, severity, 3);
+    public static void log(Severity severity, Object... message) {
+        log(severity, 3, message);
     }
 
-    private static void log(String message, Severity severity, int stackTracePosition) {
+    private static void log(Severity severity, int stackTracePosition, Object... messages) {
         if (!(PERSIST_LOGS || BuildConfig.DEBUG)) {
             return;
         }
         final StackTraceElement caller = Thread.currentThread().getStackTrace()[stackTracePosition];
-        final String print = "(" + caller.getFileName() + ":" + caller.getLineNumber() + ") " + caller.getMethodName() + "() → " + message;
+        final String print = "(" + caller.getFileName() + ":" + caller.getLineNumber() + ") " + caller.getMethodName() + "() → " + TextUtils.join(" ", messages);
         if (PERSIST_LOGS) {
             DEBUG_LOG.append(print).append("\n");
         }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java
index 37b38af59..2443a919c 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/JsonToEntityParser.java
@@ -76,7 +76,7 @@ public class JsonToEntityParser {
     }
 
     private static GroupMemberUIDs parseGroupMemberUIDs(JsonObject obj) {
-        DeckLog.verbose(obj.toString());
+        DeckLog.verbose(obj);
         GroupMemberUIDs uids = new GroupMemberUIDs();
         makeTraceableIfFails(() -> {
             JsonElement data = obj.get("ocs").getAsJsonObject().get("data");
@@ -94,7 +94,7 @@ public class JsonToEntityParser {
     }
 
     private static OcsUserList parseOcsUserList(JsonObject obj) {
-        DeckLog.verbose(obj.toString());
+        DeckLog.verbose(obj);
         OcsUserList ocsUserList = new OcsUserList();
         makeTraceableIfFails(() -> {
             JsonElement data = obj.get("ocs").getAsJsonObject().get("data");
@@ -119,7 +119,7 @@ public class JsonToEntityParser {
     }
 
     private static OcsUser parseSingleOcsUser(JsonObject obj) {
-        DeckLog.verbose(obj.toString());
+        DeckLog.verbose(obj);
         OcsUser ocsUser = new OcsUser();
         makeTraceableIfFails(() -> {
             JsonElement data = obj.get("ocs").getAsJsonObject().get("data");
@@ -138,7 +138,7 @@ public class JsonToEntityParser {
     }
 
     private static OcsProjectList parseOcsProjectList(JsonObject obj) {
-        DeckLog.verbose(obj.toString());
+        DeckLog.verbose(obj);
         OcsProjectList projectList = new OcsProjectList();
         makeTraceableIfFails(() -> {
             JsonElement data = obj.get("ocs").getAsJsonObject().get("data");
@@ -172,7 +172,7 @@ public class JsonToEntityParser {
     }
 
     private static OcsProjectResource parseOcsProjectResource(JsonObject obj) {
-        DeckLog.verbose(obj.toString());
+        DeckLog.verbose(obj);
         OcsProjectResource resource = new OcsProjectResource();
         makeTraceableIfFails(() -> {
             if (obj.has("id")) {
@@ -214,7 +214,7 @@ public class JsonToEntityParser {
     }
 
     private static OcsComment parseOcsComment(JsonObject obj) {
-        DeckLog.verbose(obj.toString());
+        DeckLog.verbose(obj);
         OcsComment comment = new OcsComment();
         makeTraceableIfFails(() -> {
             JsonElement data = obj.get("ocs").getAsJsonObject().get("data");
@@ -230,7 +230,7 @@ public class JsonToEntityParser {
     }
 
     private static DeckComment parseDeckComment(JsonElement data) {
-        DeckLog.verbose(data.toString());
+        DeckLog.verbose(data);
         DeckComment deckComment = new DeckComment();
 
         makeTraceableIfFails(() -> {
@@ -262,7 +262,7 @@ public class JsonToEntityParser {
 
     private static Mention parseMention(JsonElement mentionJson) {
         Mention mention = new Mention();
-        DeckLog.verbose(mentionJson.toString());
+        DeckLog.verbose(mentionJson);
 
 
         makeTraceableIfFails(() -> {
@@ -279,7 +279,7 @@ public class JsonToEntityParser {
     protected static FullBoard parseBoard(JsonObject e) {
         FullBoard fullBoard = new FullBoard();
 
-        DeckLog.verbose(e.toString());
+        DeckLog.verbose(e);
         Board board = new Board();
 
         makeTraceableIfFails(() -> {
@@ -365,7 +365,7 @@ public class JsonToEntityParser {
     }
 
     protected static AccessControl parseAcl(JsonObject aclJson) {
-        DeckLog.verbose(aclJson.toString());
+        DeckLog.verbose(aclJson);
         AccessControl acl = new AccessControl();
 
         if (aclJson.has("participant") && !aclJson.get("participant").isJsonNull()) {
@@ -388,7 +388,7 @@ public class JsonToEntityParser {
     }
 
     protected static FullCard parseCard(JsonObject e) {
-        DeckLog.verbose(e.toString());
+        DeckLog.verbose(e);
         FullCard fullCard = new FullCard();
         Card card = new Card();
         fullCard.setCard(card);
@@ -453,7 +453,7 @@ public class JsonToEntityParser {
     }
 
     protected static Attachment parseAttachment(JsonObject e) {
-        DeckLog.verbose(e.toString());
+        DeckLog.verbose(e);
         Attachment a = new Attachment();
         makeTraceableIfFails(() -> {
             a.setId(e.get("id").getAsLong());
@@ -488,7 +488,7 @@ public class JsonToEntityParser {
     }
 
     protected static User parseUser(JsonElement userElement) {
-        DeckLog.verbose(userElement.toString());
+        DeckLog.verbose(userElement);
         if (userElement.isJsonNull()) {
             return null;
         }
@@ -513,7 +513,7 @@ public class JsonToEntityParser {
 
 
     protected static Capabilities parseCapabilities(JsonObject e) {
-        DeckLog.verbose(e.toString());
+        DeckLog.verbose(e);
         Capabilities capabilities = new Capabilities();
         // not traceable, we need the original DeckException for error handling
         if (e.has("ocs")) {
@@ -579,7 +579,7 @@ public class JsonToEntityParser {
     }
 
     protected static FullStack parseStack(JsonObject e) {
-        DeckLog.verbose(e.toString());
+        DeckLog.verbose(e);
         FullStack fullStack = new FullStack();
         Stack stack = new Stack();
         fullStack.setStack(stack);
@@ -609,7 +609,7 @@ public class JsonToEntityParser {
     }
 
     protected static List<Activity> parseActivity(JsonObject e) {
-        DeckLog.verbose(e.toString());
+        DeckLog.verbose(e);
         List<Activity> activityList = new ArrayList<>();
 
         makeTraceableIfFails(() -> {
@@ -637,7 +637,7 @@ public class JsonToEntityParser {
     }
 
     protected static Label parseLabel(JsonObject e) {
-        DeckLog.verbose(e.toString());
+        DeckLog.verbose(e);
         Label label = new Label();
         makeTraceableIfFails(() -> {
             label.setId(e.get("id").getAsLong());
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudDeserializer.java b/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudDeserializer.java
index d23807957..0b84036a4 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudDeserializer.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/api/NextcloudDeserializer.java
@@ -26,7 +26,7 @@ public class NextcloudDeserializer<T> implements JsonDeserializer<T> {
 
     @Override
     public T deserialize(final JsonElement json, final Type typeOfT, final JsonDeserializationContext context) throws JsonParseException {
-        DeckLog.verbose(json.toString());
+        DeckLog.verbose(json);
         return JsonToEntityParser.parseJsonObject(json.getAsJsonObject(), mType);
 
     }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/enums/ActivityType.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/enums/ActivityType.java
index afaeee69c..8b4246bf2 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/model/enums/ActivityType.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/enums/ActivityType.java
@@ -43,7 +43,7 @@ public enum ActivityType {
                 return s;
             }
         }
-        DeckLog.error("unknown ActivityType path: " + id);
+        DeckLog.error("unknown ActivityType path:", id);
         return CHANGE;
     }
 
@@ -56,7 +56,7 @@ public enum ActivityType {
                 return s;
             }
         }
-        DeckLog.error("unknown ActivityType path: " + path);
+        DeckLog.error("unknown ActivityType path:", path);
         return CHANGE;
     }
 }
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 8a27bc03e..de0acc53b 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
@@ -272,12 +272,12 @@ public class SyncManager {
                             }
                         } else {
                             respondCallbacksAfterSync(callbacksQueueForSync, Boolean.FALSE, null);
-                            DeckLog.warn("No sync. Server version not supported: " + response.getDeckVersion().getOriginalVersion());
+                            DeckLog.warn("No sync. Server version not supported:", response.getDeckVersion().getOriginalVersion());
                         }
                     } else {
                         respondCallbacksAfterSync(callbacksQueueForSync, Boolean.FALSE, null);
                         if (response != null) {
-                            DeckLog.warn("No sync. Status maintenance mode: " + response.isMaintenanceEnabled());
+                            DeckLog.warn("No sync. Status maintenance mode:", response.isMaintenanceEnabled());
                         }
                     }
                 }
@@ -457,14 +457,14 @@ public class SyncManager {
                             if (requestFailedException.getStatusCode() == HTTP_UNAVAILABLE && requestFailedException.getCause() != null) {
                                 String errorString = requestFailedException.getCause().getMessage();
                                 Capabilities capabilities = GsonConfig.getGson().fromJson(errorString, Capabilities.class);
-                                DeckLog.verbose("HTTP Status " + HTTP_UNAVAILABLE + ": This server seems to be in maintenance mode.");
+                                DeckLog.verbose("HTTP Status", HTTP_UNAVAILABLE + ": This server seems to be in maintenance mode.");
                                 if (capabilities.isMaintenanceEnabled()) {
                                     doAsync(() -> onResponse(ParsedResponse.of(capabilities)));
                                 } else {
                                     onError(throwable);
                                 }
                             } else if (requestFailedException.getStatusCode() == HTTP_NOT_MODIFIED) {
-                                DeckLog.verbose("HTTP Status " + HTTP_NOT_MODIFIED + ": There haven't been any changes on the server side for this request.");
+                                DeckLog.verbose("HTTP Status", HTTP_NOT_MODIFIED + ": There haven't been any changes on the server side for this request.");
                                 //could be after maintenance. so we have to at least revert the maintenance flag
                                 doAsync(() -> {
                                     Account acc = dataBaseAdapter.getAccountByIdDirectly(account.getId());
@@ -668,7 +668,7 @@ public class SyncManager {
                                 if (newLabelId != null) {
                                     dataBaseAdapter.createJoinCardWithLabel(newLabelId, createdCardId, DBStatus.LOCAL_EDITED);
                                 } else
-                                    DeckLog.error("ID of created Label is null! Skipping assignment of \"" + oldLabel.getTitle() + "\"...");
+                                    DeckLog.error("ID of created Label is null! Skipping assignment of ", oldLabel.getTitle(), "…");
                             }
                         }
                         if (isSameAccount && oldCard.getAssignedUsers() != null) {
@@ -719,7 +719,7 @@ public class SyncManager {
                                 }
                             }).doSyncFor(new ActivityDataProvider(null, card));
                 } else {
-                    DeckLog.log("Can not fetch activities for card \"" + card.getTitle() + "\" because this card does not have a remote id yet.");
+                    DeckLog.log("Can not fetch activities for card ", card.getTitle(), "because this card does not have a remote id yet.");
                 }
             }
         });
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncWorker.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncWorker.java
index f43cbd34f..af6e08826 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncWorker.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncWorker.java
@@ -40,7 +40,7 @@ public class SyncWorker extends Worker {
             sharedPreferencesEditor.putLong(getApplicationContext().getString(R.string.shared_preference_last_background_sync), System.currentTimeMillis());
             sharedPreferencesEditor.apply();
             boolean success = syncManager.synchronizeEverything();
-            DeckLog.info("Finishing background synchronization with result " + success);
+            DeckLog.info("Finishing background synchronization. Success: ", success);
             return success ? Result.failure() : Result.success();
         }
         return Result.success();
@@ -66,17 +66,17 @@ public class SyncWorker extends Worker {
             unit = TimeUnit.HOURS;
         }
         if (unit == null) {
-            DeckLog.info("Do not register a new " + SyncWorker.class.getSimpleName() + " because setting " + preferenceValue + " is not a valid time frame");
+            DeckLog.info("Do not register a new", SyncWorker.class.getSimpleName(), "because setting", preferenceValue, "is not a valid time frame");
         } else {
             final PeriodicWorkRequest work = new PeriodicWorkRequest.Builder(SyncWorker.class, repeatInterval, unit)
                     .setConstraints(constraints).build();
-            DeckLog.info("Registering " + SyncWorker.class.getSimpleName() + " running each " + repeatInterval + " " + unit);
+            DeckLog.info("Registering", SyncWorker.class.getSimpleName(), "running each", repeatInterval, unit);
             WorkManager.getInstance(context.getApplicationContext()).enqueueUniquePeriodicWork(SyncWorker.WORKER_TAG, ExistingPeriodicWorkPolicy.REPLACE, work);
         }
     }
 
     private static void deregister(@NonNull Context context) {
-        DeckLog.info("Deregistering all " + SyncWorker.class.getSimpleName() + " with tag \"" + WORKER_TAG + "\"");
+        DeckLog.info("Deregistering all", SyncWorker.class.getSimpleName(), "with tag", WORKER_TAG);
         WorkManager.getInstance(context.getApplicationContext()).cancelAllWorkByTag(WORKER_TAG);
     }
 }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapter.java
index e0a84ccec..e21d689fe 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapter.java
@@ -232,9 +232,9 @@ public class DataBaseAdapter {
 
     @WorkerThread
     public List<FullCard> getFullCardsForStackDirectly(long accountId, long localStackId, @Nullable FilterInformation filter) {
-            return filter == null
-                    ? db.getCardDao().getFullCardsForStackDirectly(accountId, localStackId)
-                    : db.getCardDao().getFilteredFullCardsForStackDirectly(getQueryForFilter(filter, accountId, localStackId));
+        return filter == null
+                ? db.getCardDao().getFullCardsForStackDirectly(accountId, localStackId)
+                : db.getCardDao().getFilteredFullCardsForStackDirectly(getQueryForFilter(filter, accountId, localStackId));
     }
 
     @AnyThread
@@ -338,7 +338,7 @@ public class DataBaseAdapter {
             if (account.getUserName().equals(user.getUid())) {
                 for (FilterWidget widget : getFilterWidgetsByType(EWidgetType.UPCOMING_WIDGET)) {
                     for (FilterWidgetAccount widgetAccount : widget.getAccounts()) {
-                        if (widgetAccount.getAccountId() == accountId &&  widgetAccount.getUsers().isEmpty()) {
+                        if (widgetAccount.getAccountId() == accountId && widgetAccount.getUsers().isEmpty()) {
                             FilterWidgetUser u = new FilterWidgetUser();
                             u.setFilterAccountId(widgetAccount.getId());
                             u.setUserId(newId);
@@ -432,7 +432,7 @@ public class DataBaseAdapter {
             // readded!
             existing.setStatusEnum(DBStatus.LOCAL_EDITED);
             db.getJoinCardWithUserDao().update(existing);
-            notifyFilterWidgetsAboutChangedEntity(FilterWidget.EChangedEntityType.USER,localUserId);
+            notifyFilterWidgetsAboutChangedEntity(FilterWidget.EChangedEntityType.USER, localUserId);
         } else if (existing != null) {
             return;
         } else {
@@ -441,7 +441,7 @@ public class DataBaseAdapter {
             join.setUserId(localUserId);
             join.setStatus(status.getId());
             db.getJoinCardWithUserDao().insert(join);
-            notifyFilterWidgetsAboutChangedEntity(FilterWidget.EChangedEntityType.USER,localUserId);
+            notifyFilterWidgetsAboutChangedEntity(FilterWidget.EChangedEntityType.USER, localUserId);
         }
     }
 
@@ -503,7 +503,7 @@ public class DataBaseAdapter {
             long id = db.getAccountDao().insert(account);
 
             new Thread(() -> {
-                DeckLog.verbose("Adding new created " + Account.class.getSimpleName() + " with " + id + " to all instances of " + EWidgetType.UPCOMING_WIDGET.name());
+                DeckLog.verbose("Adding new created", Account.class.getSimpleName(), " with ", id, " to all instances of ", EWidgetType.UPCOMING_WIDGET.name());
                 for (FilterWidget widget : getFilterWidgetsByType(EWidgetType.UPCOMING_WIDGET)) {
                     widget.getAccounts().add(new FilterWidgetAccount(id, false));
                     updateFilterWidgetDirectly(widget);
@@ -711,7 +711,7 @@ public class DataBaseAdapter {
         Long originalStackLocalId = db.getCardDao().getLocalStackIdByLocalCardId(card.getLocalId());
         db.getCardDao().update(card);
         if (db.getSingleCardWidgetModelDao().containsCardLocalId(card.getLocalId())) {
-            DeckLog.info("Notifying " + SingleCardWidget.class.getSimpleName() + " about card changes for \"" + card.getTitle() + "\"");
+            DeckLog.info("Notifying", SingleCardWidget.class.getSimpleName(), "about card changes for", card.getTitle());
             SingleCardWidget.notifyDatasetChanged(context);
         }
         notifyFilterWidgetsAboutChangedEntity(FilterWidget.EChangedEntityType.STACK, originalStackLocalId);
@@ -1238,7 +1238,7 @@ public class DataBaseAdapter {
         new Thread(() -> {
             final List<EWidgetType> widgetTypesToNotify = db.getFilterWidgetDao().getChangedListTypesByEntity(type.toString(), entityId);
             for (EWidgetType t : widgetTypesToNotify) {
-                DeckLog.info("Notifying " + t.getWidgetClass().getSimpleName() + " about entity change: " + type.name() + " with ID " + entityId);
+                DeckLog.info("Notifying", t.getWidgetClass().getSimpleName(), "about entity change:", type.name(), "with ID", entityId);
                 context.sendBroadcast(new Intent(context, t.getWidgetClass()).setAction(AppWidgetManager.ACTION_APPWIDGET_UPDATE));
             }
         }).start();
@@ -1330,7 +1330,7 @@ public class DataBaseAdapter {
         if (filterWidget.getWidgetType() == EWidgetType.UPCOMING_WIDGET) {
             // https://github.com/stefan-niedermann/nextcloud-deck/issues/819 "no due" cards are only shown if they are on a shared board
             for (FullCard fullCard : new ArrayList<>(cardsResult)) {
-                if (fullCard.getCard().getDueDate() == null && !db.getStackDao().isStackOnSharedBoardDirectly(fullCard.getCard().getStackId())){
+                if (fullCard.getCard().getDueDate() == null && !db.getStackDao().isStackOnSharedBoardDirectly(fullCard.getCard().getStackId())) {
                     cardsResult.remove(fullCard);
                 }
             }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DeckDatabase.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DeckDatabase.java
index dc48ffd19..6f7ba45e0 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DeckDatabase.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DeckDatabase.java
@@ -145,7 +145,7 @@ public abstract class DeckDatabase extends RoomDatabase {
         @Override
         public void onCreate(@NonNull SupportSQLiteDatabase db) {
             super.onCreate(db);
-            DeckLog.info("Database \"" + DECK_DB_NAME + "\" created.");
+            DeckLog.info("Database", DECK_DB_NAME, "created.");
             LastSyncUtil.resetAll();
         }
     };
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/converter/EnumConverter.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/converter/EnumConverter.java
index cdf11493b..2cafaa8fe 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/converter/EnumConverter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/converter/EnumConverter.java
@@ -16,7 +16,7 @@ public class EnumConverter {
         try {
             return value == null ? null : EWidgetType.findById(value);
         } catch (IllegalArgumentException e) {
-            DeckLog.error(EWidgetType.class.getSimpleName() + " " + value + " not found. Falling back to generic " + EWidgetType.FILTER_WIDGET);
+            DeckLog.error(EWidgetType.class.getSimpleName(), value, "not found. Falling back to generic", EWidgetType.FILTER_WIDGET);
             return EWidgetType.FILTER_WIDGET;
         }
     }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/SyncHelper.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/SyncHelper.java
index 1e683b0c5..20421ff1a 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/SyncHelper.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/SyncHelper.java
@@ -48,7 +48,7 @@ public class SyncHelper {
                     for (T entityFromServer : response) {
                         if (entityFromServer == null) {
                             // see https://github.com/stefan-niedermann/nextcloud-deck/issues/574
-                            DeckLog.error("Skipped null value from server for DataProvider: " + provider.getClass().getSimpleName());
+                            DeckLog.error("Skipped null value from server for DataProvider:", provider.getClass().getSimpleName());
                             continue;
                         }
                         entityFromServer.setAccountId(accountId);
@@ -59,7 +59,7 @@ public class SyncHelper {
                         } else {
                             //TODO: how to handle deletes? what about archived?
                             if (existingEntity.getStatus() != DBStatus.UP_TO_DATE.getId()) {
-                                DeckLog.warn("Conflicting changes on entity: " + existingEntity);
+                                DeckLog.warn("Conflicting changes on entity:", existingEntity);
                                 // TODO: what to do?
                             } else {
                                 if (etagsEnabled && entityFromServer.getEtag() != null &&  entityFromServer.getEtag().equals(existingEntity.getEtag())) {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/AccessControlDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/AccessControlDataProvider.java
index 6dde6b45c..6f908af1a 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/AccessControlDataProvider.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/AccessControlDataProvider.java
@@ -65,7 +65,7 @@ public class AccessControlDataProvider extends AbstractSyncDataProvider<AccessCo
                 serverAdapter.getSingleUserData(uid, new IResponseCallback<OcsUser>(account) {
                     @Override
                     public void onResponse(OcsUser response) {
-                        DeckLog.log(response.toString());
+                        DeckLog.log(response);
                         User user = new User();
                         user.setUid(response.getId());
                         user.setPrimaryKey(response.getId());
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/AttachmentDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/AttachmentDataProvider.java
index 4a2b2c613..9442085cb 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/AttachmentDataProvider.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/AttachmentDataProvider.java
@@ -82,7 +82,7 @@ public class AttachmentDataProvider extends AbstractSyncDataProvider<Attachment>
             @Override
             public void onError(Throwable throwable) {
                 if (!file.delete()) {
-                    DeckLog.error("Could not delete local file: " + file.getAbsolutePath());
+                    DeckLog.error("Could not delete local file:", file.getAbsolutePath());
                 }
                 // if (HandledServerErrors.ATTACHMENTS_FILE_ALREADY_EXISTS == HandledServerErrors.fromThrowable(throwable)) {
                 dataBaseAdapter.deleteAttachment(accountId, entity, false);
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/LabelDataProvider.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/LabelDataProvider.java
index bea30e577..62354d1cf 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/LabelDataProvider.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/helpers/providers/LabelDataProvider.java
@@ -67,7 +67,7 @@ public class LabelDataProvider extends AbstractSyncDataProvider<Label> {
             @Override
             public void onError(Throwable throwable) {
                 if (HandledServerErrors.LABELS_TITLE_MUST_BE_UNIQUE == HandledServerErrors.fromThrowable(throwable)) {
-                    DeckLog.log(throwable.getCause().getMessage() + ": " + entitiy.toString());
+                    DeckLog.log(throwable.getCause().getMessage() + ":", entitiy);
                     dataBaseAdapter.deleteLabelPhysically(entitiy);
                     responder.onResponse(entitiy);
                 } else {
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 7505449ef..bcf5340d8 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
@@ -128,7 +128,7 @@ public class ImportAccountActivity extends AppCompatActivity {
                             } else {
                                 // Remember last account - THIS HAS TO BE DONE SYNCHRONOUSLY
                                 SharedPreferences.Editor editor = sharedPreferences.edit();
-                                DeckLog.log("--- Write: shared_preference_last_account" + " | " + createdAccount.getId());
+                                DeckLog.log("--- Write: shared_preference_last_account | ", createdAccount.getId());
                                 editor.putLong(sharedPreferenceLastAccount, createdAccount.getId());
                                 editor.commit();
 
@@ -207,7 +207,7 @@ public class ImportAccountActivity extends AppCompatActivity {
         DeckLog.log("Rolling back account creation for " + accountId);
         syncManager.deleteAccount(accountId);
         SharedPreferences.Editor editor = sharedPreferences.edit();
-        DeckLog.log("--- Remove: shared_preference_last_account" + " | " + accountId);
+        DeckLog.log("--- Remove: shared_preference_last_account |", accountId);
         editor.remove(sharedPreferenceLastAccount);
         editor.commit(); // Has to be done synchronously
         runOnUiThread(() -> binding.addButton.setEnabled(true));
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java
index 1c45b1c74..e8891f222 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java
@@ -305,7 +305,7 @@ public class MainActivity extends BrandedActivity implements DeleteStackListener
                         .apply(RequestOptions.circleCropTransform())
                         .into(binding.accountSwitcher);
 
-                DeckLog.verbose("Displaying maintenance mode info for " + mainViewModel.getCurrentAccount().getName() + ": " + mainViewModel.getCurrentAccount().isMaintenanceEnabled());
+                DeckLog.verbose("Displaying maintenance mode info for", mainViewModel.getCurrentAccount().getName() + ":" + mainViewModel.getCurrentAccount().isMaintenanceEnabled());
                 binding.infoBox.setVisibility(mainViewModel.getCurrentAccount().isMaintenanceEnabled() ? View.VISIBLE : View.GONE);
                 if (mainViewModel.isCurrentAccountIsSupportedVersion()) {
                     binding.infoBoxVersionNotSupported.setVisibility(View.GONE);
@@ -328,7 +328,7 @@ public class MainActivity extends BrandedActivity implements DeleteStackListener
             dragAndDrop.register(binding.viewPager, binding.stackTitles, getSupportFragmentManager());
             dragAndDrop.addItemMovedByDragListener((movedCard, stackId, position) -> {
                 mainViewModel.reorder(mainViewModel.getCurrentAccount().getId(), movedCard, stackId, position);
-                DeckLog.info("Card \"" + movedCard.getCard().getTitle() + "\" was moved to Stack " + stackId + " on position " + position);
+                DeckLog.info("Card", movedCard.getCard().getTitle(), "was moved to Stack", stackId, "on position", position);
             });
 
 
@@ -441,7 +441,7 @@ public class MainActivity extends BrandedActivity implements DeleteStackListener
 
     @Override
     public void onCreateStack(String stackName) {
-        DeckLog.info("Create Stack in account " + mainViewModel.getCurrentAccount().getName() + " on board " + mainViewModel.getCurrentBoardLocalId());
+        DeckLog.info("Create Stack in account", mainViewModel.getCurrentAccount().getName(), "on board", mainViewModel.getCurrentBoardLocalId());
         mainViewModel.createStack(mainViewModel.getCurrentAccount().getId(), stackName, mainViewModel.getCurrentBoardLocalId(), new ResponseCallback<FullStack>() {
             @Override
             public void onResponse(FullStack response) {
@@ -463,7 +463,7 @@ public class MainActivity extends BrandedActivity implements DeleteStackListener
         mainViewModel.updateStackTitle(localStackId, stackName, new ResponseCallback<FullStack>() {
             @Override
             public void onResponse(FullStack response) {
-                DeckLog.info("Successfully updated " + Stack.class.getSimpleName() + " to " + stackName);
+                DeckLog.info("Successfully updated", Stack.class.getSimpleName(), "to", stackName);
             }
 
             @Override
@@ -513,7 +513,7 @@ public class MainActivity extends BrandedActivity implements DeleteStackListener
         mainViewModel.updateBoard(fullBoard, new ResponseCallback<FullBoard>() {
             @Override
             public void onResponse(FullBoard response) {
-                DeckLog.info("Successfully updated board " + fullBoard.getBoard().getTitle());
+                DeckLog.info("Successfully updated board", fullBoard.getBoard().getTitle());
             }
 
             @Override
@@ -703,7 +703,7 @@ public class MainActivity extends BrandedActivity implements DeleteStackListener
                             mainViewModel.archiveCardsInStack(mainViewModel.getCurrentAccount().getId(), stackLocalId, filterInformation == null ? new FilterInformation() : filterInformation, new ResponseCallback<Void>() {
                                 @Override
                                 public void onResponse(Void response) {
-                                    DeckLog.info("Successfully archived all cards in stack local id " + stackLocalId);
+                                    DeckLog.info("Successfully archived all cards in stack local id", stackLocalId);
                                 }
 
                                 @Override
@@ -840,7 +840,7 @@ public class MainActivity extends BrandedActivity implements DeleteStackListener
                                                     });
                                                 });
                                             } else {
-                                                DeckLog.warn("Cannot import account because server version is too low (" + response.getDeckVersion() + "). Minimum server version is currently " + Version.minimumSupported());
+                                                DeckLog.warn("Cannot import account because server version is too low (" + response.getDeckVersion() + "). Minimum server version is currently", Version.minimumSupported());
                                                 runOnUiThread(() -> new BrandedAlertDialogBuilder(MainActivity.this)
                                                         .setTitle(R.string.update_deck)
                                                         .setMessage(getString(R.string.deck_outdated_please_update, response.getDeckVersion().getOriginalVersion()))
@@ -950,7 +950,7 @@ public class MainActivity extends BrandedActivity implements DeleteStackListener
         mainViewModel.deleteStack(mainViewModel.getCurrentAccount().getId(), stackId, mainViewModel.getCurrentBoardLocalId(), new ResponseCallback<Void>() {
             @Override
             public void onResponse(Void response) {
-                DeckLog.info("Successfully deleted stack with local id " + stackLocalId + " and remote id " + stackId);
+                DeckLog.info("Successfully deleted stack with local id", stackLocalId, "and remote id", stackId);
             }
 
             @Override
@@ -981,7 +981,7 @@ public class MainActivity extends BrandedActivity implements DeleteStackListener
         mainViewModel.deleteBoard(board, new ResponseCallback<Void>() {
             @Override
             public void onResponse(Void response) {
-                DeckLog.info("Successfully deleted board " + board.getTitle());
+                DeckLog.info("Successfully deleted board", board.getTitle());
             }
 
             @Override
@@ -1015,7 +1015,7 @@ public class MainActivity extends BrandedActivity implements DeleteStackListener
         mainViewModel.archiveBoard(board, new ResponseCallback<FullBoard>() {
             @Override
             public void onResponse(FullBoard response) {
-                DeckLog.info("Successfully archived board " + board.getTitle());
+                DeckLog.info("Successfully archived board", board.getTitle());
             }
 
             @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/PushNotificationActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/PushNotificationActivity.java
index 2e3337948..280ecebd8 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/PushNotificationActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/PushNotificationActivity.java
@@ -71,7 +71,7 @@ public class PushNotificationActivity extends AppCompatActivity {
             final String cardRemoteIdString = intent.getStringExtra(KEY_CARD_REMOTE_ID);
             final String accountString = intent.getStringExtra(KEY_ACCOUNT);
 
-            DeckLog.verbose("cardRemoteIdString = " + cardRemoteIdString);
+            DeckLog.verbose("cardRemoteIdString = ", cardRemoteIdString);
             if (ids.length == 2) {
                 if (cardRemoteIdString != null) {
                     try {
@@ -79,12 +79,12 @@ public class PushNotificationActivity extends AppCompatActivity {
                         observeOnce(viewModel.readAccount(accountString), this, (account -> {
                             if (account != null) {
                                 viewModel.setAccount(account.getName());
-                                DeckLog.verbose("account: " + account);
+                                DeckLog.verbose("account:", account);
                                 observeOnce(viewModel.getBoardByRemoteId(account.getId(), ids[0]), PushNotificationActivity.this, (board -> {
-                                    DeckLog.verbose("BoardLocalId " + board);
+                                    DeckLog.verbose("BoardLocalId:", board);
                                     if (board != null) {
                                         observeOnce(viewModel.getCardByRemoteID(account.getId(), cardRemoteId), PushNotificationActivity.this, (card -> {
-                                            DeckLog.verbose("Card: " + card);
+                                            DeckLog.verbose("Card:", card);
                                             if (card != null) {
                                                 viewModel.synchronizeCard(new IResponseCallback<Boolean>(account) {
                                                     @Override
@@ -99,18 +99,18 @@ public class PushNotificationActivity extends AppCompatActivity {
                                                     }
                                                 }, card);
                                             } else {
-                                                DeckLog.info("Card is not yet available locally. Synchronize board with localId " + board);
+                                                DeckLog.info("Card is not yet available locally. Synchronize board with localId", board);
 
                                                 viewModel.synchronizeBoard(new IResponseCallback<Boolean>(account) {
                                                     @Override
                                                     public void onResponse(Boolean response) {
                                                         runOnUiThread(() -> {
                                                             observeOnce(viewModel.getCardByRemoteID(account.getId(), cardRemoteId), PushNotificationActivity.this, (card -> {
-                                                                DeckLog.verbose("Card: " + card);
+                                                                DeckLog.verbose("Card:", card);
                                                                 if (card != null) {
                                                                     openCardOnSubmit(account, board.getLocalId(), card.getLocalId());
                                                                 } else {
-                                                                    DeckLog.warn("Something went wrong while synchronizing the card " + cardRemoteId + " (cardRemoteId). Given fullCard is null.");
+                                                                    DeckLog.warn("Something went wrong while synchronizing the card", cardRemoteId, " (cardRemoteId). Given fullCard is null.");
                                                                     applyBrandToSubmitButton(account);
                                                                     fallbackToBrowser(link);
                                                                 }
@@ -121,7 +121,7 @@ public class PushNotificationActivity extends AppCompatActivity {
                                                     @Override
                                                     public void onError(Throwable throwable) {
                                                         super.onError(throwable);
-                                                        DeckLog.warn("Something went wrong while synchronizing the board with localId " + board + ".");
+                                                        DeckLog.warn("Something went wrong while synchronizing the board with localId", board);
                                                         applyBrandToSubmitButton(account);
                                                         fallbackToBrowser(link);
                                                     }
@@ -129,13 +129,13 @@ public class PushNotificationActivity extends AppCompatActivity {
                                             }
                                         }));
                                     } else {
-                                        DeckLog.warn("Given localBoardId for cardRemoteId " + cardRemoteId + " is null.");
+                                        DeckLog.warn("Given localBoardId for cardRemoteId", cardRemoteId, "is null.");
                                         applyBrandToSubmitButton(account);
                                         fallbackToBrowser(link);
                                     }
                                 }));
                             } else {
-                                DeckLog.warn("Given account for " + accountString + " is null.");
+                                DeckLog.warn("Given account for", accountString, "is null.");
                                 fallbackToBrowser(link);
                             }
                         }));
@@ -144,11 +144,11 @@ public class PushNotificationActivity extends AppCompatActivity {
                         fallbackToBrowser(link);
                     }
                 } else {
-                    DeckLog.warn(KEY_CARD_REMOTE_ID + " is null.");
+                    DeckLog.warn(KEY_CARD_REMOTE_ID, "is null.");
                     fallbackToBrowser(link);
                 }
             } else {
-                DeckLog.warn("Link does not contain two IDs (expected one board id and one card id): " + link);
+                DeckLog.warn("Link does not contain two IDs (expected one board id and one card id):", link);
                 fallbackToBrowser(link);
             }
         } catch (Throwable t) {
@@ -196,7 +196,7 @@ public class PushNotificationActivity extends AppCompatActivity {
 
     @UiThread
     private void launchEditActivity(@NonNull Account account, Long boardId, Long cardId) {
-        DeckLog.info("starting " + EditActivity.class.getSimpleName() + " with [" + account + ", " + boardId + ", " + cardId + "]");
+        DeckLog.info("starting", EditActivity.class.getSimpleName(), "with [" + account + ", " + boardId + ", " + cardId + "]");
         startActivity(EditActivity.createEditCardIntent(this, account, boardId, cardId));
         finish();
     }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedboards/ArchivedBoardsActvitiy.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedboards/ArchivedBoardsActvitiy.java
index b3b9cf092..5a198dec3 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedboards/ArchivedBoardsActvitiy.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedboards/ArchivedBoardsActvitiy.java
@@ -84,7 +84,7 @@ public class ArchivedBoardsActvitiy extends BrandedActivity implements DeleteBoa
         viewModel.deleteBoard(board, new ResponseCallback<Void>() {
             @Override
             public void onResponse(Void response) {
-                DeckLog.info("Successfully deleted board " + board.getTitle());
+                DeckLog.info("Successfully deleted board", board.getTitle());
             }
 
             @Override
@@ -102,7 +102,7 @@ public class ArchivedBoardsActvitiy extends BrandedActivity implements DeleteBoa
         viewModel.updateBoard(fullBoard, new ResponseCallback<FullBoard>() {
             @Override
             public void onResponse(FullBoard response) {
-                DeckLog.info("Successfully updated board " + fullBoard.getBoard().getTitle());
+                DeckLog.info("Successfully updated board", fullBoard.getBoard().getTitle());
             }
 
             @Override
@@ -118,7 +118,7 @@ public class ArchivedBoardsActvitiy extends BrandedActivity implements DeleteBoa
         viewModel.dearchiveBoard(board, new ResponseCallback<FullBoard>() {
             @Override
             public void onResponse(FullBoard response) {
-                DeckLog.info("Successfully dearchived board " + response.getBoard().getTitle());
+                DeckLog.info("Successfully dearchived board", response.getBoard().getTitle());
             }
 
             @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedcards/ArchivedCardsAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedcards/ArchivedCardsAdapter.java
index a0177da69..8968cbd72 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedcards/ArchivedCardsAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/archivedcards/ArchivedCardsAdapter.java
@@ -37,7 +37,7 @@ public class ArchivedCardsAdapter extends CardAdapter {
             mainViewModel.dearchiveCard(fullCard, new ResponseCallback<FullCard>() {
                 @Override
                 public void onResponse(FullCard response) {
-                    DeckLog.info("Successfully dearchived " + Card.class.getSimpleName() + " " + fullCard.getCard().getTitle());
+                    DeckLog.info("Successfully dearchived", Card.class.getSimpleName(), fullCard.getCard().getTitle());
                 }
 
                 @Override
@@ -51,7 +51,7 @@ public class ArchivedCardsAdapter extends CardAdapter {
             mainViewModel.deleteCard(fullCard.getCard(), new ResponseCallback<Void>() {
                 @Override
                 public void onResponse(Void response) {
-                    DeckLog.info("Successfully deleted card " + fullCard.getCard().getTitle());
+                    DeckLog.info("Successfully deleted card", fullCard.getCard().getTitle());
                 }
 
                 @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlDialogFragment.java
index 1512900a1..44bbcfe19 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/accesscontrol/AccessControlDialogFragment.java
@@ -103,7 +103,7 @@ public class AccessControlDialogFragment extends BrandedDialogFragment implement
         viewModel.updateAccessControl(accessControl, new ResponseCallback<AccessControl>() {
             @Override
             public void onResponse(AccessControl response) {
-                DeckLog.info("Successfully updated " + AccessControl.class.getSimpleName() + " for user " + accessControl.getUser().getDisplayname());
+                DeckLog.info("Successfully updated", AccessControl.class.getSimpleName(), "for user", accessControl.getUser().getDisplayname());
             }
 
             @Override
@@ -119,7 +119,7 @@ public class AccessControlDialogFragment extends BrandedDialogFragment implement
         viewModel.deleteAccessControl(ac, new ResponseCallback<Void>() {
             @Override
             public void onResponse(Void response) {
-                DeckLog.info("Successfully deleted access control for user " + ac.getUser().getDisplayname());
+                DeckLog.info("Successfully deleted access control for user", ac.getUser().getDisplayname());
             }
 
             @Override
@@ -147,7 +147,7 @@ public class AccessControlDialogFragment extends BrandedDialogFragment implement
         viewModel.createAccessControl(viewModel.getCurrentAccount().getId(), ac, new ResponseCallback<AccessControl>() {
             @Override
             public void onResponse(AccessControl response) {
-                DeckLog.info("Successfully created " + AccessControl.class.getSimpleName() + " for user " + user.getDisplayname());
+                DeckLog.info("Successfully created", AccessControl.class.getSimpleName(), "for user", user.getDisplayname());
             }
 
             @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/managelabels/ManageLabelsDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/managelabels/ManageLabelsDialogFragment.java
index 99c9663aa..51ba42dd6 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/managelabels/ManageLabelsDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/board/managelabels/ManageLabelsDialogFragment.java
@@ -146,7 +146,7 @@ public class ManageLabelsDialogFragment extends BrandedDialogFragment implements
         viewModel.deleteLabel(label, new ResponseCallback<Void>() {
             @Override
             public void onResponse(Void response) {
-                DeckLog.info("Successfully deleted label " + label.getTitle());
+                DeckLog.info("Successfully deleted label", label.getTitle());
             }
 
             @Override
@@ -169,7 +169,7 @@ public class ManageLabelsDialogFragment extends BrandedDialogFragment implements
         viewModel.updateLabel(label, new ResponseCallback<Label>() {
             @Override
             public void onResponse(Label label) {
-                DeckLog.verbose("Successfully update label " + label.getTitle());
+                DeckLog.verbose("Successfully update label", label.getTitle());
             }
 
             @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/branding/BrandingUtil.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/branding/BrandingUtil.java
index 389c3d745..863375ae5 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/branding/BrandingUtil.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/branding/BrandingUtil.java
@@ -44,7 +44,7 @@ public abstract class BrandingUtil {
             activity.applyBrand(mainColor);
         }
         final SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        DeckLog.log("--- Write: shared_preference_theme_main" + " | " + mainColor);
+        DeckLog.log("--- Write: shared_preference_theme_main |", mainColor);
         editor.putInt(context.getString(R.string.shared_preference_theme_main), mainColor);
         editor.apply();
     }
@@ -55,7 +55,7 @@ public abstract class BrandingUtil {
             activity.applyBrand(ContextCompat.getColor(context, R.color.defaultBrand));
         }
         final SharedPreferences.Editor editor = PreferenceManager.getDefaultSharedPreferences(context).edit();
-        DeckLog.log("--- Write: Remove: shared_preference_theme_main" + " | ");
+        DeckLog.log("--- Write: Remove: shared_preference_theme_main | ");
         editor.remove(context.getString(R.string.shared_preference_theme_main));
         editor.apply();
     }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java
index 746b75802..1e92eb1b3 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java
@@ -217,7 +217,7 @@ public class CardAdapter extends RecyclerView.Adapter<AbstractCardViewHolder> im
             mainViewModel.archiveCard(fullCard, new ResponseCallback<FullCard>() {
                 @Override
                 public void onResponse(FullCard response) {
-                    DeckLog.info("Successfully archived " + Card.class.getSimpleName() + " " + fullCard.getCard().getTitle());
+                    DeckLog.info("Successfully archived", Card.class.getSimpleName(), fullCard.getCard().getTitle());
                 }
 
                 @Override
@@ -231,7 +231,7 @@ public class CardAdapter extends RecyclerView.Adapter<AbstractCardViewHolder> im
             mainViewModel.deleteCard(fullCard.getCard(), new ResponseCallback<Void>() {
                 @Override
                 public void onResponse(Void response) {
-                    DeckLog.info("Successfully deleted card " + fullCard.getCard().getTitle());
+                    DeckLog.info("Successfully deleted card", fullCard.getCard().getTitle());
                 }
 
                 @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/EditActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/EditActivity.java
index bf7d32b56..15a1a6fb7 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/EditActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/EditActivity.java
@@ -151,7 +151,7 @@ public class EditActivity extends BrandedActivity {
             }
         }));
 
-        DeckLog.verbose("Finished loading intent data: { accountId = " + viewModel.getAccount().getId() + " , cardId = " + cardId + " }");
+        DeckLog.verbose("Finished loading intent data: { accountId =", viewModel.getAccount().getId(), "cardId =", cardId, "}");
     }
 
     private static void fillTitleAndDescription(@NonNull Card card, @NonNull Version version, @Nullable String title, @Nullable String description) {
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java
index 4b7c1ac3e..e14d2fd12 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/attachments/CardAttachmentsFragment.java
@@ -398,7 +398,7 @@ public class CardAttachmentsFragment extends BrandedFragment implements Attachme
         switch (sourceUri.getScheme()) {
             case ContentResolver.SCHEME_CONTENT:
             case ContentResolver.SCHEME_FILE: {
-                DeckLog.verbose("--- found content URL " + sourceUri.getPath());
+                DeckLog.verbose("--- found content URL", sourceUri.getPath());
                 // Separate Thread required because picked file might not yet be locally available
                 // https://github.com/stefan-niedermann/nextcloud-deck/issues/814
                 new Thread(() -> {
@@ -505,7 +505,7 @@ public class CardAttachmentsFragment extends BrandedFragment implements Attachme
             editViewModel.deleteAttachmentOfCard(editViewModel.getAccount().getId(), editViewModel.getFullCard().getLocalId(), attachment.getLocalId(), new ResponseCallback<Void>() {
                 @Override
                 public void onResponse(Void response) {
-                    DeckLog.info("Successfully delete " + Attachment.class.getSimpleName() + " " + attachment.getFilename() + " from " + Card.class.getSimpleName() + " " + editViewModel.getFullCard().getCard().getTitle());
+                    DeckLog.info("Successfully delete", Attachment.class.getSimpleName(), attachment.getFilename(), "from", Card.class.getSimpleName(), editViewModel.getFullCard().getCard().getTitle());
                 }
 
                 @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsAdapter.java
index d42b702f3..4fde5a4e1 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsAdapter.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsAdapter.java
@@ -66,7 +66,7 @@ public class CardCommentsAdapter extends RecyclerView.Adapter<ItemCommentViewHol
         final FullDeckComment comment = comments.get(position);
         holder.bind(comment, account, mainColor, menuInflater, deletedListener, selectAsReplyListener, fragmentManager, (changedText) -> {
             if (!Objects.equals(changedText, comment.getComment().getMessage())) {
-                DeckLog.info("Toggled checkbox in comment #" + comment.getLocalId());
+                DeckLog.info("Toggled checkbox in comment with localId", comment.getLocalId());
                 this.editListener.onCommentEdited(comment.getLocalId(), changedText.toString());
             }
         });
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsFragment.java
index b3f1938b6..2f538f9bb 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/comments/CardCommentsFragment.java
@@ -144,7 +144,7 @@ public class CardCommentsFragment extends BrandedFragment implements CommentEdit
         commentsViewModel.deleteComment(mainViewModel.getAccount().getId(), mainViewModel.getFullCard().getLocalId(), localId, new ResponseCallback<Void>() {
             @Override
             public void onResponse(Void response) {
-                DeckLog.info("Successfully deleted comment with local id " + localId);
+                DeckLog.info("Successfully deleted comment with localId", localId);
             }
 
             @Override
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/projectresources/CardProjectResourceViewHolder.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/projectresources/CardProjectResourceViewHolder.java
index 272945e45..c398d9814 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/projectresources/CardProjectResourceViewHolder.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/projectresources/CardProjectResourceViewHolder.java
@@ -86,14 +86,14 @@ public class CardProjectResourceViewHolder extends RecyclerView.ViewHolder {
                     break;
                 }
                 default: {
-                    DeckLog.info("Unknown resource type for " + resource.getName() + ": " + resource.getType());
+                    DeckLog.info("Unknown resource type for", resource.getName() + ":", resource.getType());
                     binding.type.setVisibility(GONE);
                     linkifyViewHolder(account, link);
                     break;
                 }
             }
         } else {
-            DeckLog.warn("Resource type for " + resource.getName() + " is null");
+            DeckLog.warn("Resource type for", resource.getName(), "is null");
             binding.type.setVisibility(GONE);
         }
     }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/movecard/MoveCardDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/movecard/MoveCardDialogFragment.java
index 35ef6a8e2..442f2c6eb 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/movecard/MoveCardDialogFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/movecard/MoveCardDialogFragment.java
@@ -81,7 +81,7 @@ public class MoveCardDialogFragment extends BrandedDialogFragment implements Pic
         binding = DialogMoveCardBinding.inflate(inflater);
         binding.title.setText(getString(R.string.action_card_move_title, originCardTitle));
         binding.submit.setOnClickListener((v) -> {
-            DeckLog.verbose("[Move card] Attempt to move to " + Stack.class.getSimpleName() + " #" + selectedStack.getLocalId());
+            DeckLog.verbose("[Move card] Attempt to move to", Stack.class.getSimpleName(), "#" + selectedStack.getLocalId());
             this.moveCardListener.move(originAccountId, originCardLocalId, selectedAccount.getId(), selectedBoard.getLocalId(), selectedStack.getLocalId());
             dismiss();
         });
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/settings/SettingsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/settings/SettingsFragment.java
index b22b58a08..93ac73054 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/settings/SettingsFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/settings/SettingsFragment.java
@@ -35,11 +35,11 @@ public class SettingsFragment extends PreferenceFragmentCompat {
         if (wifiOnlyPref != null) {
             wifiOnlyPref.setOnPreferenceChangeListener((Preference preference, Object newValue) -> {
                 final Boolean syncOnWifiOnly = (Boolean) newValue;
-                DeckLog.log("syncOnWifiOnly: " + syncOnWifiOnly);
+                DeckLog.log("syncOnWifiOnly:", syncOnWifiOnly);
                 return true;
             });
         } else {
-            DeckLog.error("Could not find preference with key: \"" + getString(R.string.pref_key_wifi_only) + "\"");
+            DeckLog.error("Could not find preference with key: ", getString(R.string.pref_key_wifi_only));
         }
 
         Preference themePref = findPreference(getString(R.string.pref_key_dark_theme));
@@ -51,7 +51,7 @@ public class SettingsFragment extends PreferenceFragmentCompat {
                 return true;
             });
         } else {
-            DeckLog.error("Could not find preference with key: \"" + getString(R.string.pref_key_dark_theme) + "\"");
+            DeckLog.error("Could not find preference with key:", getString(R.string.pref_key_dark_theme));
         }
 
         compactPref = findPreference(getString(R.string.pref_key_compact));
@@ -63,18 +63,18 @@ public class SettingsFragment extends PreferenceFragmentCompat {
                 return true;
             });
         } else {
-            DeckLog.error("Could not find preference with key: \"" + getString(R.string.pref_key_background_sync) + "\"");
+            DeckLog.error("Could not find preference with key", getString(R.string.pref_key_background_sync));
         }
 
         debuggingPref = findPreference(getString(R.string.pref_key_debugging));
         if (debuggingPref != null) {
             debuggingPref.setOnPreferenceChangeListener((Preference preference, Object newValue) -> {
                 DeckLog.enablePeristentLogs((Boolean) newValue);
-                DeckLog.log("persistet debug logs: " + newValue);
+                DeckLog.log("persistet debug logs:", newValue);
                 return true;
             });
         } else {
-            DeckLog.error("Could not find preference with key: \"" + getString(R.string.pref_key_debugging) + "\"");
+            DeckLog.error("Could not find preference with key:", getString(R.string.pref_key_debugging));
         }
 
         eTagPref = findPreference(getString(R.string.pref_key_etags));
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareTargetActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareTargetActivity.java
index 340b4d023..21aafed30 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareTargetActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/sharetarget/ShareTargetActivity.java
@@ -159,7 +159,7 @@ public class ShareTargetActivity extends MainActivity implements SelectCardListe
                     switch (which) {
                         case 0:
                             final String oldDescription = fullCard.getCard().getDescription();
-                            DeckLog.info("Adding to card #" + fullCard.getCard().getId() + " (" + fullCard.getCard().getTitle() + "): Text \"" + receivedText + "\"");
+                            DeckLog.info("Adding to card with id", fullCard.getCard().getId(), "(" + fullCard.getCard().getTitle() + "):", receivedText);
                             fullCard.getCard().setDescription(
                                     (oldDescription == null || oldDescription.length() == 0)
                                             ? receivedText
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackFragment.java
index d2362cdff..80440b9d0 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackFragment.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackFragment.java
@@ -159,7 +159,7 @@ public class StackFragment extends BrandedFragment implements DragAndDropTab<Car
             if (liveData.hasError() && !SyncManager.ignoreExceptionOnVoidError(liveData.getError())) {
                 ExceptionDialogFragment.newInstance(liveData.getError(), null).show(getChildFragmentManager(), ExceptionDialogFragment.class.getSimpleName());
             } else {
-                DeckLog.log("Moved " + Card.class.getSimpleName() + " \"" + originCardLocalId + "\" to " + Stack.class.getSimpleName() + " \"" + targetStackLocalId + "\"");
+                DeckLog.log("Moved", Card.class.getSimpleName(), originCardLocalId, "to", Stack.class.getSimpleName(), targetStackLocalId);
             }
         });
     }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/takephoto/TakePhotoActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/takephoto/TakePhotoActivity.java
index 71526136c..e1398bab7 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/takephoto/TakePhotoActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/takephoto/TakePhotoActivity.java
@@ -123,7 +123,7 @@ public class TakePhotoActivity extends BrandedActivity {
                     @Override
                     public void onImageSaved(@NonNull ImageCapture.OutputFileResults outputFileResults) {
                         final Uri savedUri = Uri.fromFile(photoFile);
-                        DeckLog.info("onImageSaved - savedUri: " + savedUri.toString());
+                        DeckLog.info("onImageSaved - savedUri:", savedUri.toString());
                         setResult(RESULT_OK, new Intent().setDataAndType(savedUri, IMAGE_JPEG));
                         finish();
                     }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/filter/FilterWidgetConfigurationActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/filter/FilterWidgetConfigurationActivity.java
index f277801b2..102860d7c 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/filter/FilterWidgetConfigurationActivity.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/filter/FilterWidgetConfigurationActivity.java
@@ -50,7 +50,7 @@ public class FilterWidgetConfigurationActivity extends AppCompatActivity {
         binding.submit.setOnClickListener((v) -> {
             final Bundle extras = new Bundle();
 
-            viewModel.updateFilterWidget(response -> DeckLog.verbose("Successfully updated " + FilterWidget.class.getSimpleName() + " with id " + appWidgetId));
+            viewModel.updateFilterWidget(response -> DeckLog.verbose("Successfully updated", FilterWidget.class.getSimpleName(), "with id", appWidgetId));
             Intent updateIntent = new Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE, null, getApplicationContext(), FilterWidget.class);
             extras.putInt(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/filter/FilterWidgetFactory.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/filter/FilterWidgetFactory.java
index 21b28ccae..fbc3900f7 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/filter/FilterWidgetFactory.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/filter/FilterWidgetFactory.java
@@ -56,7 +56,7 @@ public class FilterWidgetFactory implements RemoteViewsService.RemoteViewsFactor
         RemoteViews widget_entry;
 
         if (i > (data.size() - 1) || data.get(i) == null) {
-            DeckLog.error("Card not found at position " + i);
+            DeckLog.error("Card not found at position", i);
             return null;
         }
 
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/stack/StackWidget.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/stack/StackWidget.java
index 8b13e93a5..5b0907ef3 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/stack/StackWidget.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/stack/StackWidget.java
@@ -39,10 +39,10 @@ public class StackWidget extends AppWidgetProvider {
         if (ACTION_APPWIDGET_UPDATE.equals(intent.getAction())) {
             if (intent.hasExtra(AppWidgetManager.EXTRA_APPWIDGET_ID)) {
                 final int appWidgetId = intent.getExtras().getInt(AppWidgetManager.EXTRA_APPWIDGET_ID, -1);
-                DeckLog.verbose(ACTION_APPWIDGET_UPDATE + " for " + StackWidget.class.getSimpleName() + " with id " + appWidgetId + ", perform update.");
+                DeckLog.verbose(ACTION_APPWIDGET_UPDATE, "for", StackWidget.class.getSimpleName(), "with id", appWidgetId, "→ perform update.");
                 updateAppWidget(context, awm, new int[]{appWidgetId});
             } else {
-                DeckLog.verbose(ACTION_APPWIDGET_UPDATE + " for " + StackWidget.class.getSimpleName() + ": Triggering update for all widgets of this type.");
+                DeckLog.verbose(ACTION_APPWIDGET_UPDATE, "→ Triggering update for all widgets of type", StackWidget.class.getSimpleName());
                 updateAppWidget(context, awm, awm.getAppWidgetIds(new ComponentName(context, StackWidget.class)));
             }
         }
@@ -54,7 +54,7 @@ public class StackWidget extends AppWidgetProvider {
         final SyncManager syncManager = new SyncManager(context);
 
         for (int appWidgetId : appWidgetIds) {
-            DeckLog.info("Delete " + StackWidget.class.getSimpleName() + " with id " + appWidgetId);
+            DeckLog.info("Delete", StackWidget.class.getSimpleName(), "with id", appWidgetId);
             syncManager.deleteFilterWidget(appWidgetId, response -> DeckLog.verbose("Successfully deleted " + StackWidget.class.getSimpleName() + " with id " + appWidgetId));
         }
     }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/stack/StackWidgetFactory.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/stack/StackWidgetFactory.java
index 0ee8877f5..e44fd9876 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/stack/StackWidgetFactory.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/stack/StackWidgetFactory.java
@@ -45,12 +45,12 @@ public class StackWidgetFactory implements RemoteViewsService.RemoteViewsFactory
     public void onDataSetChanged() {
         try {
             final List<FilterWidgetCard> response = syncManager.getCardsForFilterWidget(appWidgetId);
-            DeckLog.verbose(StackWidget.class.getSimpleName() + " with id " + appWidgetId + " fetched " + response.size() + " cards from the database.");
+            DeckLog.verbose(StackWidget.class.getSimpleName(), "with id", appWidgetId, "fetched", response.size(), "cards from the database.");
             data.clear();
             Collections.sort(response, Comparator.comparingLong(value -> value.getCard().getCard().getOrder()));
             data.addAll(response);
         } catch (NoSuchElementException e) {
-            DeckLog.error("No " + StackWidget.class.getSimpleName() + " for appWidgetId " + appWidgetId + " found.");
+            DeckLog.error("No", StackWidget.class.getSimpleName(), "for appWidgetId", appWidgetId, "found.");
             DeckLog.logError(e);
         }
     }
@@ -69,7 +69,7 @@ public class StackWidgetFactory implements RemoteViewsService.RemoteViewsFactory
     @Override
     public RemoteViews getViewAt(int i) {
         if (i > (data.size() - 1) || data.get(i) == null) {
-            DeckLog.error("No card or separator not found at position " + i);
+            DeckLog.error("No card or separator not found at position", i);
             return null;
         }
         final RemoteViews widget_entry;
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidget.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidget.java
index e5a5e2fa1..bedf5253f 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidget.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidget.java
@@ -41,7 +41,7 @@ public class UpcomingWidget extends AppWidgetProvider {
         for (int appWidgetId : appWidgetIds) {
             new Thread(() -> {
                 if (syncManager.filterWidgetExists(appWidgetId)) {
-                    DeckLog.warn(UpcomingWidget.class.getSimpleName() + "with id " + appWidgetId + " already exists, perform update instead.");
+                    DeckLog.warn(UpcomingWidget.class.getSimpleName(), "with id", appWidgetId, "already exists, perform update instead.");
                     updateAppWidget(context, appWidgetManager, appWidgetIds);
                 } else {
                     final List<Account> accountsList = syncManager.readAccountsDirectly();
@@ -55,13 +55,13 @@ public class UpcomingWidget extends AppWidgetProvider {
                     syncManager.createFilterWidget(config, new ResponseCallback<Integer>() {
                         @Override
                         public void onResponse(Integer response) {
-                            DeckLog.verbose("Successfully created " + UpcomingWidget.class.getSimpleName() + "with id " + appWidgetId);
+                            DeckLog.verbose("Successfully created", UpcomingWidget.class.getSimpleName(), "with id", appWidgetId);
                             updateAppWidget(context, appWidgetManager, appWidgetIds);
                         }
 
                         @Override
                         public void onError(Throwable throwable) {
-                            DeckLog.error("Error while creating " + UpcomingWidget.class.getSimpleName() + "with id " + appWidgetId);
+                            DeckLog.error("Error while creating", UpcomingWidget.class.getSimpleName(), "with id", appWidgetId);
                             ResponseCallback.super.onError(throwable);
                             onDeleted(context, appWidgetIds);
                         }
@@ -80,10 +80,10 @@ public class UpcomingWidget extends AppWidgetProvider {
         if (ACTION_APPWIDGET_UPDATE.equals(intent.getAction())) {
             if (intent.hasExtra(AppWidgetManager.EXTRA_APPWIDGET_ID)) {
                 final int appWidgetId = intent.getExtras().getInt(AppWidgetManager.EXTRA_APPWIDGET_ID, -1);
-                DeckLog.verbose(ACTION_APPWIDGET_UPDATE + " for " + UpcomingWidget.class.getSimpleName() + " with id " + appWidgetId + ", perform update.");
+                DeckLog.verbose(ACTION_APPWIDGET_UPDATE, "for", UpcomingWidget.class.getSimpleName(), "with id", appWidgetId, "→ perform update.");
                 updateAppWidget(context, awm, new int[]{appWidgetId});
             } else {
-                DeckLog.verbose(ACTION_APPWIDGET_UPDATE + " for " + UpcomingWidget.class.getSimpleName() + ": Triggering update for all widgets of this type.");
+                DeckLog.verbose(ACTION_APPWIDGET_UPDATE, "→ Triggering update for all widgets of type", UpcomingWidget.class.getSimpleName());
                 updateAppWidget(context, awm, awm.getAppWidgetIds(new ComponentName(context, UpcomingWidget.class)));
             }
         }
@@ -95,7 +95,7 @@ public class UpcomingWidget extends AppWidgetProvider {
         final SyncManager syncManager = new SyncManager(context);
 
         for (int appWidgetId : appWidgetIds) {
-            DeckLog.info("Delete " + UpcomingWidget.class.getSimpleName() + " with id " + appWidgetId);
+            DeckLog.info("Delete", UpcomingWidget.class.getSimpleName(), "with id", appWidgetId);
             syncManager.deleteFilterWidget(appWidgetId, response -> DeckLog.verbose("Successfully deleted " + UpcomingWidget.class.getSimpleName() + " with id " + appWidgetId));
         }
     }
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidgetFactory.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidgetFactory.java
index dc4d98b6e..964c21ffa 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidgetFactory.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/upcoming/UpcomingWidgetFactory.java
@@ -58,7 +58,7 @@ public class UpcomingWidgetFactory implements RemoteViewsService.RemoteViewsFact
     public void onDataSetChanged() {
         try {
             final List<FilterWidgetCard> response = syncManager.getCardsForFilterWidget(appWidgetId);
-            DeckLog.verbose(UpcomingWidgetFactory.class.getSimpleName() + " with id " + appWidgetId + " fetched " + response.size() + " cards from the database.");
+            DeckLog.verbose(UpcomingWidgetFactory.class.getSimpleName(), "with id", appWidgetId, "fetched", response.size(), "cards from the database.");
             data.clear();
             final Comparator<FilterWidgetCard> comparator = Comparator.comparing((card -> {
                 if (card != null &&
@@ -95,7 +95,7 @@ public class UpcomingWidgetFactory implements RemoteViewsService.RemoteViewsFact
             EUpcomingDueType lastDueType = null;
             for (FilterWidgetCard filterWidgetCard : response) {
                 final EUpcomingDueType nextDueType = getDueType(filterWidgetCard.getCard().getCard().getDueDate());
-                DeckLog.info(filterWidgetCard.getCard().getCard().getTitle() + ": " + nextDueType.name());
+                DeckLog.info(filterWidgetCard.getCard().getCard().getTitle() + ":", nextDueType.name());
                 if (!nextDueType.equals(lastDueType)) {
                     data.add(new Separator(nextDueType.toString(context)));
                     lastDueType = nextDueType;
@@ -103,7 +103,7 @@ public class UpcomingWidgetFactory implements RemoteViewsService.RemoteViewsFact
                 data.add(filterWidgetCard);
             }
         } catch (NoSuchElementException e) {
-            DeckLog.error("No " + UpcomingWidget.class.getSimpleName() + " for appWidgetId " + appWidgetId + " found.");
+            DeckLog.error("No", UpcomingWidget.class.getSimpleName(), "for appWidgetId", appWidgetId, "found.");
             DeckLog.logError(e);
         }
     }
@@ -121,7 +121,7 @@ public class UpcomingWidgetFactory implements RemoteViewsService.RemoteViewsFact
     @Override
     public RemoteViews getViewAt(int i) {
         if (i > (data.size() - 1) || data.get(i) == null) {
-            DeckLog.error("No card or separator not found at position " + i);
+            DeckLog.error("No card or separator not found at position", i);
             return null;
         }
         final RemoteViews widget_entry;
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/util/FilesUtil.java b/app/src/main/java/it/niedermann/nextcloud/deck/util/FilesUtil.java
index 4847ac256..6feb4d80c 100644
--- a/app/src/main/java/it/niedermann/nextcloud/deck/util/FilesUtil.java
+++ b/app/src/main/java/it/niedermann/nextcloud/deck/util/FilesUtil.java
@@ -51,14 +51,14 @@ public class FilesUtil {
     public static File getTempCacheFile(@NonNull Context context, String fileName) throws IOException {
         File cacheFile = new File(context.getApplicationContext().getFilesDir().getAbsolutePath() + "/" + fileName);
 
-        DeckLog.verbose("- Full path for new cache file: " + cacheFile.getAbsolutePath());
+        DeckLog.verbose("- Full path for new cache file:", cacheFile.getAbsolutePath());
 
         final File tempDir = cacheFile.getParentFile();
         if (tempDir == null) {
             throw new FileNotFoundException("could not cacheFile.getParentFile()");
         }
         if (!tempDir.exists()) {
-            DeckLog.verbose("-- The folder in which the new file should be created does not exist yet. Trying to create it...");
+            DeckLog.verbose("-- The folder in which the new file should be created does not exist yet. Trying to create it…");
             if (tempDir.mkdirs()) {
                 DeckLog.verbose("--- Creation successful");
             } else {