diff --git a/app/src/main/java/com/owncloud/android/MainApp.java b/app/src/main/java/com/owncloud/android/MainApp.java
index 8ffefe4656ae..5cfe64a065ac 100644
--- a/app/src/main/java/com/owncloud/android/MainApp.java
+++ b/app/src/main/java/com/owncloud/android/MainApp.java
@@ -287,7 +287,7 @@ public static AppComponent getAppComponent() {
@SuppressFBWarnings("ST")
@Override
public void onCreate() {
- //enableStrictMode();
+ enableStrictMode();
viewThemeUtils = viewThemeUtilsProvider.get();
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
index f0c2aaf14a1f..3e8affd32946 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/ConflictsResolveActivity.java
@@ -84,6 +84,7 @@ public static Intent createIntent(OCFile file,
intent.setFlags(intent.getFlags() | flag);
}
intent.putExtra(EXTRA_FILE, file);
+ intent.putExtra(EXTRA_EXISTING_FILE, file);
intent.putExtra(EXTRA_USER, user);
intent.putExtra(EXTRA_CONFLICT_UPLOAD_ID, conflictUploadId);
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java b/app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java
index 0298ef49bc0e..47dea84f3ba7 100755
--- a/app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/UploadListAdapter.java
@@ -495,11 +495,10 @@ private boolean checkAndOpenConflictResolutionDialog(User user,
OCUpload item,
String status) {
String remotePath = item.getRemotePath();
- OCFile ocFile = storageManager.getFileByPath(remotePath);
+ OCFile ocFile = storageManager.getFileByDecryptedRemotePath(remotePath);
- if (ocFile == null) {
- // Remote file doesn't exist, try to refresh folder
- OCFile folder = storageManager.getFileByPath(new File(remotePath).getParent() + "/");
+ if (ocFile == null) { // Remote file doesn't exist, try to refresh folder
+ OCFile folder = storageManager.getFileByDecryptedRemotePath(new File(remotePath).getParent() + "/");
if (folder != null && folder.isFolder()) {
this.refreshFolder(itemViewHolder, user, folder, (caller, result) -> {
itemViewHolder.binding.uploadStatus.setText(status);
diff --git a/app/src/main/res/color/dialog_positive_btn_color.xml b/app/src/main/res/color/dialog_positive_btn_color.xml
index 061efcc9d9e4..5913e0da1a1d 100644
--- a/app/src/main/res/color/dialog_positive_btn_color.xml
+++ b/app/src/main/res/color/dialog_positive_btn_color.xml
@@ -1,7 +1,5 @@
-
- %d ausgewählt
- %d ausgewählt
+
Ersetzen
Alle ersetzen
Beide behalten
@@ -988,4 +989,5 @@
%d Dateikonflikte
%1$s ist im Zielordner bereits vorhanden. Möchten Sie die bestehende Datei behalten oder überschreiben?
Die Dateien sind im Zielordner bereits vorhanden. Möchten Sie die bestehenden Dateien behalten oder überschreiben?
+
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 0ec6735d4cc8..88a29668c4cd 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -31,7 +31,6 @@
#121212
#000000
#818181
- @color/grey_0
#222222
#ffffff
@@ -49,4 +48,70 @@
#1E1E1E
@android:color/white
+
+
+ #FFFFFF
+ @color/grey_30
+ @color/grey_30
+ #CCCCCC
+ @color/grey_70
+ @color/grey_80
+ #2D2D2D
+ @color/grey_70
+ @color/grey_70
+
+
+ @color/grey_80
+ @color/grey_0
+
+
+ @color/grey_80
+ @color/grey_0
+
+
+ @color/grey_60
+ @color/grey_0
+ @color/grey_0
+ @color/grey_30
+ #FFFFFF
+ @color/grey_30
+ @color/grey_80
+ #FFFFFF
+
+
+ @color/grey_80
+ @color/grey_30
+ @color/grey_0
+
+
+ @color/grey_80
+ @color/grey_0
+ @color/grey_80
+
+
+ @color/grey_70
+ @color/grey_60
+ @color/grey_70
+ @color/grey_60
+
+
+ @color/grey_70
+ @color/grey_70
+
+
+ #FFFFFF
+ @color/grey_30
+ @color/grey_0
+ @color/grey_0
+ @color/grey_0
+ @color/grey_0
+ @color/grey_60
+ @color/grey_0
+ #FFFFFF
+
+
+ #121212
+ @color/grey_0
+ @color/grey_80
+ @color/grey_80
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f036313412d0..1ddf1a93ca08 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -39,9 +39,7 @@
#222222
#EEEEEE
#BDBDBD
- #F2F2F2
#666666
- #B2B2B2
@@ -59,7 +57,6 @@
#D6D7D7
#000000
#ededed
- #191919
#000000
#ffffff
@@ -84,4 +81,95 @@
@android:color/white
#666666
#A5A5A5
+
+
+ #191919
+ @color/primary
+ #191919
+ #191919
+ @color/grey_30
+ @android:color/white
+ #FFFFFF
+ @color/grey_0
+ #CCCCCC
+ #77c4ff
+ #B3FFFFFF
+ @color/grey_10
+
+
+ #101010
+ #F2F2F2
+ #E5E5E5
+ #B2B2B2
+ #666666
+ #4C4C4C
+ #333333
+
+
+ @color/design_snackbar_background_color
+ @color/white
+
+
+ #FFFFFF
+ #191919
+
+
+ @color/grey_0
+ #191919
+ @color/primary
+ #191919
+ @color/primary
+ @color/grey_30
+ @color/white
+ #191919
+
+
+ #FFFFFF
+ #191919
+ #191919
+
+
+ #FFFFFF
+ #191919
+ #FFFFFF
+
+
+ @color/primary
+ #F399C7
+ @color/grey_0
+ @color/grey_0
+ #FFFFFF
+ @color/grey_30
+ @color/grey_0
+ @color/grey_0
+
+
+ @color/primary
+ @color/grey_30
+ @color/grey_30
+ #CCCCCC
+
+
+ #191919
+ @color/grey_30
+ #191919
+ #191919
+ #191919
+ #191919
+ @color/grey_30
+ #191919
+ #000000
+ #191919
+ #F6E5EB
+ #C16F81
+ #0D39DF
+ #0099ff
+
+
+ @color/grey_0
+ #191919
+ @color/grey_0
+ @color/grey_30
+ #77b6bb
+ #5077b6bb
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index d976f96e19d6..cc9e25255a10 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,12 +1,9 @@
- 116dp
4dp
16dp
24dp
6dp
- 14sp
- 16sp
18sp
15sp
15dp
@@ -31,4 +28,4 @@
145dp
1dp
13sp
-
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0eaab9725367..93e4cfcfebef 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1079,6 +1079,7 @@
Multiple images
Cannot create local file
Invalid filename for local file
+
Replace
Replace all
Keep both
@@ -1090,6 +1091,7 @@
%1$s already exists in this location. Do you want to replace it with the
file you are moving?
The files already exist in this location. Do you want to replace them with the files you are moving?
+
Groupfolders
+%1$d
Unable to open password-protected PDF. Please use an external PDF viewer.
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 48463c12f8c3..cb75d3abe684 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -463,6 +463,19 @@
- ?android:attr/colorBackground
+
+
+
+
+
+
+
-
-
-
-