solve git conflict

Signed-off-by: alperozturk <[email protected]>

Author: alperozturk96

.github/workflows/screenShotTest.yml

@@ -28,14 +28,14 @@ jobs:
             -   uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
 
             -   name: Gradle cache
-                uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+                uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
                 with:
                     path: |
                         ~/.gradle/caches
                         ~/.gradle/wrapper
                     key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }}-${{ hashFiles('**/gradle/wrapper/gradle-wrapper.properties') }}
             -   name: AVD cache
-                uses: actions/cache@1bd1e32a3bdc45362d1e726936510720a7c30a57 # v4.2.0
+                uses: actions/cache@0c907a75c2c80ebcb7f088228285e798b750cf8f # v4.2.1
                 id: avd-cache
                 with:
                     path: |

app/screenshots/gplay/debug/com.owncloud.android.ui.activity.ConflictsResolveActivityIT_keepBoth.png

@@ -45,11 +45,13 @@ public class ConflictsResolveActivityIT extends AbstractIT {
     @ScreenshotTest
     public void screenshotTextFiles() {
         OCFile newFile = new OCFile("/newFile.txt");
+        newFile.setRemoteId("0001");
         newFile.setFileLength(56000);
         newFile.setModificationTimestamp(1522019340);
         newFile.setStoragePath(FileStorageUtils.getSavePath(user.getAccountName()) + "/nonEmpty.txt");
 
         OCFile existingFile = new OCFile("/newFile.txt");
+        existingFile.setRemoteId("0002");
         existingFile.setFileLength(1024000);
         existingFile.setModificationTimestamp(1582019340);
 
@@ -185,11 +187,13 @@ public void keepExisting() {
                                           user.getAccountName());
 
         OCFile existingFile = new OCFile("/newFile.txt");
+        existingFile.setRemoteId("0001");
         existingFile.setFileLength(1024000);
         existingFile.setModificationTimestamp(1582019340);
 
         OCFile newFile = new OCFile("/newFile.txt");
         newFile.setFileLength(56000);
+        newFile.setRemoteId("0002");
         newFile.setModificationTimestamp(1522019340);
         newFile.setStoragePath(FileStorageUtils.getSavePath(user.getAccountName()) + "/nonEmpty.txt");
 
@@ -276,11 +280,13 @@ public void keepBoth() {
                                           user.getAccountName());
 
         OCFile existingFile = new OCFile("/newFile.txt");
+        existingFile.setRemoteId("0001");
         existingFile.setFileLength(1024000);
         existingFile.setModificationTimestamp(1582019340);
 
         OCFile newFile = new OCFile("/newFile.txt");
         newFile.setFileLength(56000);
+        newFile.setRemoteId("0002");
         newFile.setModificationTimestamp(1522019340);
         newFile.setStoragePath(FileStorageUtils.getSavePath(user.getAccountName()) + "/nonEmpty.txt");
 

app/screenshots/gplay/debug/com.owncloud.android.ui.activity.ConflictsResolveActivityIT_keepExisting.png

@@ -587,6 +587,7 @@ public void testFileActionsBottomSheet() {
         }
 
         OCFile ocFile = new OCFile("/test.md");
+        ocFile.setRemoteId("0001");
         final FileActionsBottomSheet sut = FileActionsBottomSheet.newInstance(ocFile, false);
         showDialog(sut);
     }

app/screenshots/gplay/debug/com.owncloud.android.ui.activity.ConflictsResolveActivityIT_screenshotTextFiles.png

@@ -617,6 +617,7 @@ class FileDetailSharingFragmentIT : AbstractIT() {
         sut.refreshCapabilitiesFromDB()
 
         val userShare = OCShare().apply {
+            remoteId = 1001L
             isFolder = false
             shareType = ShareType.USER
             permissions = 17

app/screenshots/gplay/debug/com.owncloud.android.ui.dialog.DialogFragmentIT_testFileActionsBottomSheet.png

@@ -23,8 +23,6 @@ import com.nextcloud.client.preferences.AppPreferences
 import com.nextcloud.model.WorkerState
 import com.nextcloud.model.WorkerStateLiveData
 import com.nextcloud.utils.extensions.getPercent
-import com.nextcloud.utils.extensions.showToast
-import com.owncloud.android.R
 import com.owncloud.android.datamodel.FileDataStorageManager
 import com.owncloud.android.datamodel.ThumbnailsCacheManager
 import com.owncloud.android.datamodel.UploadsStorageManager
@@ -315,7 +313,7 @@ class FileUploadWorker(
                 context
             )
         ) {
-            context.showToast(R.string.file_upload_worker_same_file_already_exists)
+            uploadFileOperation.handleLocalBehaviour()
             return
         }
 

app/screenshots/gplay/debug/com.owncloud.android.ui.fragment.OCFileListFragmentStaticServerIT_showFiles.png

@@ -167,14 +167,6 @@ default void onDarkThemeModeChanged(DarkMode mode) {
      */
     String[] getPassCode();
 
-    /**
-     * Gets the unlock via fingerprint preference configured by the user.
-     *
-     * @implNote  this is always false
-     * @return useFingerprint     is unlock with fingerprint enabled
-     */
-    boolean isFingerprintUnlockEnabled();
-
     /**
      * Gets the auto upload paths flag last set.
      *
@@ -210,7 +202,7 @@ default void onDarkThemeModeChanged(DarkMode mode) {
      * Get preferred folder sort order.
      *
      * @param folder Folder whoch order is being retrieved or null for root folder
-     * @return sort order     the sort order, default is {@link FileSortOrder#sort_a_to_z} (sort by name)
+     * @return sort order     the sort order, default is {@link FileSortOrder# sort_a_to_z} (sort by name)
      */
     FileSortOrder getSortOrderByFolder(@Nullable OCFile folder);
 
@@ -232,7 +224,7 @@ default void onDarkThemeModeChanged(DarkMode mode) {
     /**
      * Get preferred folder sort order.
      *
-     * @return sort order     the sort order, default is {@link FileSortOrder#sort_a_to_z} (sort by name)
+     * @return sort order     the sort order, default is {@link FileSortOrder# sort_a_to_z} (sort by name)
      */
     FileSortOrder getSortOrderByType(FileSortOrder.Type type, FileSortOrder defaultOrder);
     FileSortOrder getSortOrderByType(FileSortOrder.Type type);

app/screenshots/gplay/debug/com.owncloud.android.ui.fragment.OCFileListFragmentStaticServerIT_showSharedFiles.png

@@ -312,11 +312,6 @@ public String[] getPassCode() {
         };
     }
 
-    @Override
-    public boolean isFingerprintUnlockEnabled() {
-        return preferences.getBoolean(SettingsActivity.PREFERENCE_USE_FINGERPRINT, false);
-    }
-
     @Override
     public String getFolderLayout(OCFile folder) {
         return getFolderPreference(context,

app/src/androidTest/java/com/owncloud/android/ui/activity/ConflictsResolveActivityIT.java

@@ -133,8 +133,8 @@ class PassCodeManager(private val preferences: AppPreferences, private val clock
     }
 
     private fun deviceCredentialsAreEnabled(activity: Activity): Boolean {
-        return SettingsActivity.LOCK_DEVICE_CREDENTIALS == preferences.lockPreference ||
-            (preferences.isFingerprintUnlockEnabled && DeviceCredentialUtils.areCredentialsAvailable(activity))
+        return (preferences.lockPreference == SettingsActivity.LOCK_DEVICE_CREDENTIALS) &&
+            DeviceCredentialUtils.areCredentialsAvailable(activity)
     }
 
     private fun getActivityRootView(activity: Activity): View? {

app/src/androidTest/java/com/owncloud/android/ui/dialog/DialogFragmentIT.java

@@ -845,7 +845,7 @@ private void updateMetadataForV2(DecryptedFolderMetadataFile metadata, Encryptio
 
     private void completeE2EUpload(RemoteOperationResult result, E2EFiles e2eFiles, OwnCloudClient client) {
         if (result.isSuccess()) {
-            handleSuccessfulUpload(e2eFiles.getTemporalFile(), e2eFiles.getExpectedFile(), e2eFiles.getOriginalFile(), client);
+            handleLocalBehaviour(e2eFiles.getTemporalFile(), e2eFiles.getExpectedFile(), e2eFiles.getOriginalFile(), client);
         } else if (result.getCode() == ResultCode.SYNC_CONFLICT) {
             getStorageManager().saveConflict(mFile, mFile.getEtagInConflict());
         }
@@ -1098,7 +1098,7 @@ private RemoteOperationResult normalUpload(OwnCloudClient client) {
         }
 
         if (result.isSuccess()) {
-            handleSuccessfulUpload(temporalFile, expectedFile, originalFile, client);
+            handleLocalBehaviour(temporalFile, expectedFile, originalFile, client);
         } else if (result.getCode() == ResultCode.SYNC_CONFLICT) {
             getStorageManager().saveConflict(mFile, mFile.getEtagInConflict());
         }
@@ -1197,10 +1197,31 @@ private RemoteOperationResult checkNameCollision(OCFile parentFile,
         return null;
     }
 
-    private void handleSuccessfulUpload(File temporalFile,
-                                        File expectedFile,
-                                        File originalFile,
-                                        OwnCloudClient client) {
+    public void handleLocalBehaviour() {
+        if (user == null || mFile == null || mContext == null) {
+            Log_OC.d(TAG, "handleLocalBehaviour: user, file, or context is null.");
+            return;
+        }
+
+        final var client = getClient();
+        if (client == null) {
+            Log_OC.d(TAG, "handleLocalBehaviour: client is null");
+            return;
+        }
+
+        String expectedPath = FileStorageUtils.getDefaultSavePathFor(user.getAccountName(), mFile);
+        File expectedFile = new File(expectedPath);
+        File originalFile = new File(mOriginalStoragePath);
+        String temporalPath = FileStorageUtils.getInternalTemporalPath(user.getAccountName(), mContext) + mFile.getRemotePath();
+        File temporalFile = new File(temporalPath);
+
+        handleLocalBehaviour(temporalFile, expectedFile, originalFile, client);
+    }
+
+    private void handleLocalBehaviour(File temporalFile,
+                                      File expectedFile,
+                                      File originalFile,
+                                      OwnCloudClient client) {
         switch (mLocalBehaviour) {
             case FileUploadWorker.LOCAL_BEHAVIOUR_FORGET:
             default:

app/src/androidTest/java/com/owncloud/android/ui/fragment/FileDetailSharingFragmentIT.kt

@@ -109,7 +109,6 @@ public class SettingsActivity extends PreferenceActivity
     public static final String LOCK_DEVICE_CREDENTIALS = "device_credentials";
 
 
-    public final static String PREFERENCE_USE_FINGERPRINT = "use_fingerprint";
     public static final String PREFERENCE_SHOW_MEDIA_SCAN_NOTIFICATIONS = "show_media_scan_notifications";
 
     private static final int ACTION_REQUEST_PASSCODE = 5;

app/src/main/java/com/nextcloud/client/jobs/upload/FileUploadWorker.kt

@@ -17,7 +17,6 @@
 import android.content.ContentValues;
 import android.content.res.ColorStateList;
 import android.content.res.Resources;
-import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.drawable.Drawable;
 import android.os.Handler;
@@ -74,7 +73,6 @@
 import com.owncloud.android.ui.fragment.SearchType;
 import com.owncloud.android.ui.interfaces.OCFileListFragmentInterface;
 import com.owncloud.android.ui.preview.PreviewTextFragment;
-import com.owncloud.android.utils.BitmapUtils;
 import com.owncloud.android.utils.DisplayUtils;
 import com.owncloud.android.utils.FileSortOrder;
 import com.owncloud.android.utils.FileStorageUtils;
@@ -91,8 +89,7 @@
 import java.util.Locale;
 import java.util.Set;
 import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
+import java.util.stream.Collectors;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -524,8 +521,6 @@ private void bindListGridItemViewHolder(ListGridItemViewHolder holder, OCFile fi
                 holder.getFileName().setVisibility(View.VISIBLE);
             }
         }
-
-        configureThumbnail(holder, file);
     }
 
     private void bindListItemViewHolder(ListItemViewHolder holder, OCFile file) {
@@ -633,8 +628,6 @@ private void bindListItemViewHolder(ListItemViewHolder holder, OCFile file) {
         } else {
             holder.getOverflowMenu().setImageResource(R.drawable.ic_dots_vertical);
         }
-
-        configureThumbnail(holder, file);
     }
 
     private void applyChipVisuals(Chip chip, Tag tag) {
@@ -674,44 +667,6 @@ private String getFileSizeText(OCFile file, long size) {
         return activity.getString(R.string.oc_file_list_adapter_offline_operation_description_text);
     }
 
-    private final ExecutorService executorService = Executors.newCachedThreadPool();
-
-    private void configureThumbnail(ListViewHolder holder, OCFile file) {
-        final var context = MainApp.getAppContext();
-
-        if (file.isOfflineOperation()) {
-            if (file.isFolder()) {
-                Drawable icon = ContextCompat.getDrawable(context, R.drawable.ic_folder_offline);
-                holder.getThumbnail().setImageDrawable(icon);
-            } else {
-                executorService.execute(() -> {
-                    OfflineOperationEntity entity = mStorageManager.offlineOperationDao.getByPath(file.getDecryptedRemotePath());
-
-                    if (entity != null && entity.getType() != null && entity.getType() instanceof OfflineOperationType.CreateFile createFileOperation) {
-                        Bitmap bitmap = BitmapUtils.decodeSampledBitmapFromFile(createFileOperation.getLocalPath(), holder.getThumbnail().getWidth(), holder.getThumbnail().getHeight());
-                        if (bitmap == null) return;
-
-                        Bitmap thumbnail = BitmapUtils.addColorFilter(bitmap, Color.GRAY,100);
-                        activity.runOnUiThread(() -> holder.getThumbnail().setImageBitmap(thumbnail));
-                    }
-                });
-            }
-        } else {
-            boolean isAutoUpload = SyncedFolderProvider.isAutoUploadFolder(syncedFolderProvider, file, user);
-            boolean isDarkModeActive = preferences.isDarkModeEnabled();
-            Drawable icon = MimeTypeUtil.getOCFileIcon(file, context, viewThemeUtils, isAutoUpload, isDarkModeActive);
-            holder.getThumbnail().setImageDrawable(icon);
-
-            if (!file.isFolder()) {
-                ViewExtensionsKt.makeRounded(holder.getThumbnail(), context, 4);
-            }
-        }
-    }
-
-    public void onDestroy() {
-        executorService.shutdown();
-    }
-
     @Override
     public void onViewAttachedToWindow(@NonNull RecyclerView.ViewHolder holder) {
         if (holder instanceof ListViewHolder) {

app/src/main/java/com/nextcloud/client/preferences/AppPreferences.java

@@ -211,6 +211,7 @@ class OCFileListDelegate(
         )
     }
 
+    @Suppress("MagicNumber")
     fun bindGridViewHolder(
         gridViewHolder: ListViewHolder,
         file: OCFile,
@@ -256,6 +257,10 @@ class OCFileListDelegate(
         } else {
             configureSharedIconView(gridViewHolder, file)
         }
+
+        if (!file.isOfflineOperation && !file.isFolder) {
+            gridViewHolder.thumbnail.makeRounded(context, 4f)
+        }
     }
 
     private fun bindUnreadComments(file: OCFile, gridViewHolder: ListViewHolder) {