From 88e4b60486a135f3d0f6a34eb7f13e3831ee90b5 Mon Sep 17 00:00:00 2001 From: alperozturk Date: Wed, 11 Oct 2023 16:54:03 +0200 Subject: [PATCH 1/2] Fix missing appPreferences Signed-off-by: alperozturk --- .../com/nextcloud/client/preferences/AppPreferencesImpl.java | 1 + .../java/com/nextcloud/ui/fileactions/FileActionsBottomSheet.kt | 2 +- .../com/owncloud/android/ui/dialog/ConflictsResolveDialog.java | 2 +- app/src/main/java/com/owncloud/android/utils/DisplayUtils.java | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java b/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java index 0449a103b3b9..20dde8f3dce6 100644 --- a/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java +++ b/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java @@ -26,6 +26,7 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.SharedPreferences; +import android.util.Log; import com.google.gson.Gson; import com.nextcloud.appReview.AppReviewShownModel; diff --git a/app/src/main/java/com/nextcloud/ui/fileactions/FileActionsBottomSheet.kt b/app/src/main/java/com/nextcloud/ui/fileactions/FileActionsBottomSheet.kt index 3ee0a9907187..de58c75a9d78 100644 --- a/app/src/main/java/com/nextcloud/ui/fileactions/FileActionsBottomSheet.kt +++ b/app/src/main/java/com/nextcloud/ui/fileactions/FileActionsBottomSheet.kt @@ -151,7 +151,7 @@ class FileActionsBottomSheet : BottomSheetDialogFragment(), Injectable { false, context, binding.thumbnailLayout.thumbnailShimmer, - null, + syncedFolderProvider.preferences, viewThemeUtils, syncedFolderProvider ) diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java b/app/src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java index 46937b7a677d..a7333ffcab73 100644 --- a/app/src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java +++ b/app/src/main/java/com/owncloud/android/ui/dialog/ConflictsResolveDialog.java @@ -213,7 +213,7 @@ public Dialog onCreateDialog(Bundle savedInstanceState) { false, getContext(), null, - null, + syncedFolderProvider.getPreferences(), viewThemeUtils, syncedFolderProvider); diff --git a/app/src/main/java/com/owncloud/android/utils/DisplayUtils.java b/app/src/main/java/com/owncloud/android/utils/DisplayUtils.java index 5550e85405cc..492dc035d964 100644 --- a/app/src/main/java/com/owncloud/android/utils/DisplayUtils.java +++ b/app/src/main/java/com/owncloud/android/utils/DisplayUtils.java @@ -47,6 +47,7 @@ import android.text.format.DateUtils; import android.text.style.StyleSpan; import android.util.DisplayMetrics; +import android.util.Log; import android.view.View; import android.view.WindowManager; import android.widget.FrameLayout; From dfee4ef7b63f30e4825bc4980bfb8cc7c4741e2e Mon Sep 17 00:00:00 2001 From: alperozturk Date: Wed, 11 Oct 2023 16:55:34 +0200 Subject: [PATCH 2/2] Optimize imports Signed-off-by: alperozturk --- .../com/nextcloud/client/preferences/AppPreferencesImpl.java | 1 - app/src/main/java/com/owncloud/android/utils/DisplayUtils.java | 1 - 2 files changed, 2 deletions(-) diff --git a/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java b/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java index 20dde8f3dce6..0449a103b3b9 100644 --- a/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java +++ b/app/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java @@ -26,7 +26,6 @@ import android.annotation.SuppressLint; import android.content.Context; import android.content.SharedPreferences; -import android.util.Log; import com.google.gson.Gson; import com.nextcloud.appReview.AppReviewShownModel; diff --git a/app/src/main/java/com/owncloud/android/utils/DisplayUtils.java b/app/src/main/java/com/owncloud/android/utils/DisplayUtils.java index 492dc035d964..5550e85405cc 100644 --- a/app/src/main/java/com/owncloud/android/utils/DisplayUtils.java +++ b/app/src/main/java/com/owncloud/android/utils/DisplayUtils.java @@ -47,7 +47,6 @@ import android.text.format.DateUtils; import android.text.style.StyleSpan; import android.util.DisplayMetrics; -import android.util.Log; import android.view.View; import android.view.WindowManager; import android.widget.FrameLayout;