Merge branch 'master' into fix/e2ee-verify-metadata

Signed-off-by: Alper Öztürk <67455295+alperozturk96@users.noreply.github.com>

Author: alperozturk96

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:noble@sha256:c4a8d5503dfb2a3eb8ab5f807da5bc69a85730fb49b5cfca2330194ebcc41c7b
+FROM ubuntu:resolute@sha256:5e275723f82c67e387ba9e3c24baa0abdcb268917f276a0561c97bef9450d0b4
 
 ARG DEBIAN_FRONTEND=noninteractive
 ENV ANDROID_HOME=/usr/lib/android-sdk

Gemfile.lock

@@ -8,8 +8,8 @@ GEM
     artifactory (3.0.17)
     atomos (0.1.3)
     aws-eventstream (1.4.0)
-    aws-partitions (1.1240.0)
-    aws-sdk-core (3.245.0)
+    aws-partitions (1.1241.0)
+    aws-sdk-core (3.246.0)
       aws-eventstream (~> 1, >= 1.3.0)
       aws-partitions (~> 1, >= 1.992.0)
       aws-sigv4 (~> 1.9)
@@ -20,7 +20,7 @@ GEM
     aws-sdk-kms (1.123.0)
       aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.219.0)
+    aws-sdk-s3 (1.220.0)
       aws-sdk-core (~> 3, >= 3.244.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.5)

app/build.gradle.kts

@@ -81,7 +81,13 @@ val ncTestServerPassword = configProps["NC_TEST_SERVER_PASSWORD"]
 val ncTestServerBaseUrl = configProps["NC_TEST_SERVER_BASEURL"]
 
 android {
+    // install this NDK version and CMake to produce smaller APKs. Build will still work if not installed
     ndkVersion = "${ndkEnv["NDK_VERSION"]}"
+    externalNativeBuild {
+        cmake {
+            version = "${ndkEnv["CMAKE_VERSION"]}"
+        }
+    }
 
     namespace = "com.owncloud.android"
     testNamespace = "${namespace}.test"
@@ -100,6 +106,10 @@ android {
         targetSdk = 36
         compileSdk = 36
 
+        ndk {
+            abiFilters += listOf("arm64-v8a", "x86_64", "x86")
+        }
+
         buildConfigField("boolean", "CI", ciBuild.toString())
         buildConfigField("boolean", "RUNTIME_PERF_ANALYSIS", perfAnalysis.toString())
 

app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -865,7 +865,12 @@ private void setupFileNameInputField() {
         if (mStreamsToUpload == null || mStreamsToUpload.size() != 1) {
             return;
         }
-        final String fileName = getDisplayNameForUri((Uri) mStreamsToUpload.get(0), getActivity());
+
+        if (!(mStreamsToUpload.get(0) instanceof Uri source)) {
+            return;
+        }
+
+        final String fileName = getDisplayNameForUri(source, getActivity());
         if (fileName == null) {
             return;
         }

app/src/main/java/com/owncloud/android/ui/adapter/helper/OCFileListAdapterHelper.kt

@@ -118,28 +118,27 @@ class OCFileListAdapterHelper {
 
     @Suppress("NestedBlockDepth")
     private fun mergeOCFilesForLivePhoto(files: List<OCFile>): List<OCFile> {
+        val localIdMap: Map<String, OCFile> = files
+            .filter { it.localId != 0L && it.localId != -1L }
+            .associateBy { it.localId.toString() }
+
         val filesToRemove = mutableSetOf<OCFile>()
 
-        for (i in files.indices) {
-            val file = files[i]
-
-            for (j in i + 1 until files.size) {
-                val nextFile = files[j]
-                val fileLocalId = file.localId.toString()
-                val nextFileLinkedLocalId = nextFile.linkedFileIdForLivePhoto
-
-                if (fileLocalId == nextFileLinkedLocalId) {
-                    when {
-                        MimeTypeUtil.isVideo(file.mimeType) -> {
-                            nextFile.livePhotoVideo = file
-                            filesToRemove.add(file)
-                        }
-
-                        MimeTypeUtil.isVideo(nextFile.mimeType) -> {
-                            file.livePhotoVideo = nextFile
-                            filesToRemove.add(nextFile)
-                        }
-                    }
+        for (file in files) {
+            val linkedId = file.linkedFileIdForLivePhoto ?: continue
+
+            // no match, skip
+            val linkedFile = localIdMap[linkedId] ?: continue
+
+            when {
+                MimeTypeUtil.isVideo(linkedFile.mimeType) -> {
+                    file.livePhotoVideo = linkedFile
+                    filesToRemove.add(linkedFile)
+                }
+
+                MimeTypeUtil.isVideo(file.mimeType) -> {
+                    linkedFile.livePhotoVideo = file
+                    filesToRemove.add(file)
                 }
             }
         }

app/src/main/java/com/owncloud/android/ui/helpers/UriUploader.kt

@@ -76,14 +76,12 @@ class UriUploader @JvmOverloads constructor(
                 code = UriUploaderResultCode.ERROR_SENSITIVE_PATH
             } else {
                 val uris = mUrisToUpload
-                    .filterNotNull()
-                    .map { it as Uri }
-                    .map { Pair(it, getRemotePathForUri(it)) }
+                    .mapNotNull { (it as? Uri)?.let { sourceUri -> Pair(sourceUri, getRemotePathForUri(sourceUri)) } }
 
                 val fileUris = uris.filter { it.first.scheme == ContentResolver.SCHEME_FILE }
                 if (fileUris.isNotEmpty()) {
-                    val localPaths = Array<String>(fileUris.size) { "" }
-                    val remotePaths = Array<String>(fileUris.size) { "" }
+                    val localPaths = Array(fileUris.size) { "" }
+                    val remotePaths = Array(fileUris.size) { "" }
 
                     for (i in 0..<fileUris.size) {
                         val uri = fileUris[i]

app/src/main/res/values-ar/strings.xml

@@ -227,6 +227,7 @@
     <string name="create_new_presentation">عرض تقديمي جديد</string>
     <string name="create_new_spreadsheet">جدول بيانات جديد</string>
     <string name="create_rich_workspace">إضافة وصف للمجلد</string>
+    <string name="creates_rich_workspace">إضافة وصف للمجلد</string>
     <string name="credentials_disabled">التصريح غير مفعل</string>
     <string name="daily_backup">النسخ الاحتياطي اليومي</string>
     <string name="data_to_back_up">البيانات التي سيتم نسخها احتياطيا</string>
@@ -285,6 +286,7 @@
     <string name="drawer_item_notifications">الإخطارات</string>
     <string name="drawer_item_on_device">على الجهاز</string>
     <string name="drawer_item_personal_files">ملفات شخصية</string>
+    <string name="drawer_item_recently_modified">تغيرت مؤخراً</string>
     <string name="drawer_item_shared">المشاركات</string>
     <string name="drawer_item_trashbin">الملفات المحذوفة</string>
     <string name="drawer_item_uploads_list">التحميلات</string>
@@ -395,6 +397,7 @@
     <string name="file_list_empty_on_device">الملفات والمجلدات التي تم تنزيلها سوف تظهر هنا.</string>
     <string name="file_list_empty_recent_files_description">الملفات و المجلدات التي تمّ تعديلها مؤخراً ستظهر هنا.</string>
     <string name="file_list_empty_recent_files_headline">لا توجد أي ملفات تمّ تعديلها مؤخراً</string>
+    <string name="file_list_empty_recently_modified">لا يوجد ملفات معدلة خلال 7 أيام ماضية</string>
     <string name="file_list_empty_search">ربما كنت تنوي البحث داخل مجلد آخر ؟</string>
     <string name="file_list_empty_shared">الملفات والمجلدات التي تم مشاركتها سوف تظهر هنا.</string>
     <string name="file_list_empty_shared_headline">لم تقم بمشاركة أية بيانات بعد</string>
@@ -779,6 +782,7 @@
     <string name="select_template">حدد قالب</string>
     <string name="send">إرسال</string>
     <string name="send_share">أرسِل المشاركة</string>
+    <string name="sendbutton_description">أيقونة زر الإرسال</string>
     <string name="set_as">حفظ كـ</string>
     <string name="set_note">عيِّن الملاحظة</string>
     <string name="set_online_status">حالة الاتصال</string>
@@ -813,6 +817,7 @@
     <string name="share_not_allowed_when_file_drop">إعادة المشاركة غير مسموح بها خلال الإفلات الآمن للملف</string>
     <string name="share_permission_can_edit">يمكن تعديله</string>
     <string name="share_permission_file_request">طلب الملف</string>
+    <string name="share_permission_secure_file_drop">إسقاط آمن للملف</string>
     <string name="share_permission_view_only">للعرض فقط</string>
     <string name="share_permissions">أذونات المشاركة</string>
     <string name="share_re_share_permission">مُشارَكة</string>
@@ -1007,6 +1012,7 @@
     <string name="upload_query_move_foreign_files">يمنع وجود مساحة غير كافية نسخ الملفات المحددة إلى المجلد %1$s. هل ترغب في نقلهم إلى هناك بدلاً من ذلك؟</string>
     <string name="upload_quota_exceeded">الحصة التخزينية تمّ استنفاذها</string>
     <string name="upload_scan_doc_upload">مسح مستند عبر الكاميرا</string>
+    <string name="upload_sync_conflict">تعارض المزامنة ، يرجى حلها يدويًا</string>
     <string name="upload_unknown_error">خطأ غير معروف</string>
     <string name="uploader_btn_alternative_text">إختر</string>
     <string name="uploader_btn_upload_text">رفع</string>
@@ -1054,6 +1060,7 @@
     <string name="uploads_view_upload_status_failed_localfile_error">لم يتم العثور على الملف المحلّي</string>
     <string name="uploads_view_upload_status_failed_permission_error">خطأ في الإذن</string>
     <string name="uploads_view_upload_status_failed_ssl_certificate_not_trusted">شهادة خادم غير موثوق بها</string>
+    <string name="uploads_view_upload_status_fetching_server_version">جارٍ جلب إصدار الخادم…</string>
     <string name="uploads_view_upload_status_service_interrupted">توقف التطبيق</string>
     <string name="uploads_view_upload_status_succeeded">مكتمل</string>
     <string name="uploads_view_upload_status_succeeded_same_file">نفس الملف موجود على موقع قَصِي. سيتم تخطِّي الرفع</string>

app/src/main/res/values-ast/strings.xml

@@ -155,6 +155,7 @@
     <string name="drawer_item_notifications">Avisos</string>
     <string name="drawer_item_on_device">Nel preséu</string>
     <string name="drawer_item_personal_files">Ficheros personales</string>
+    <string name="drawer_item_recently_modified">Modificao apocayá</string>
     <string name="drawer_item_shared">Compartío</string>
     <string name="drawer_item_trashbin">Ficheros desaniciaos</string>
     <string name="drawer_item_uploads_list">Xubes </string>
@@ -625,6 +626,7 @@
     <string name="uploads_view_upload_status_failed_folder_error">Fallu de carpeta</string>
     <string name="uploads_view_upload_status_failed_localfile_error">Ficheru llocal nun s\'atopó</string>
     <string name="uploads_view_upload_status_failed_permission_error">Fallu de permisu</string>
+    <string name="uploads_view_upload_status_fetching_server_version">Diendo en cata de la versión del sirvidor…</string>
     <string name="uploads_view_upload_status_service_interrupted">Aplicación finada</string>
     <string name="uploads_view_upload_status_succeeded">Completáu</string>
     <string name="uploads_view_upload_status_unknown_fail">Fallu desconocíu</string>

app/src/main/res/values-b+en+001/strings.xml

@@ -55,6 +55,7 @@
     <string name="assistant_screen_empty_content_description">Try sending a message to spark a conversation.</string>
     <string name="assistant_screen_empty_content_title">Hello there! What can I help you with today?</string>
     <string name="assistant_screen_retry_response_generation">Retry response generation</string>
+    <string name="assistant_screen_select_task">Please select task</string>
     <string name="assistant_screen_send_message">Send message</string>
     <string name="assistant_screen_task_bar_open_conversation_list">Open conversation list</string>
     <string name="assistant_screen_task_create_fail_message">An error occurred while creating the task</string>
@@ -322,6 +323,7 @@
     <string name="drawer_item_on_device">On device</string>
     <string name="drawer_item_personal_files">Personal files</string>
     <string name="drawer_item_recent_files">Recent files</string>
+    <string name="drawer_item_recently_modified">Recently modified</string>
     <string name="drawer_item_shared">Shared</string>
     <string name="drawer_item_trashbin">Deleted files</string>
     <string name="drawer_item_uploads_list">Uploads</string>
@@ -857,6 +859,7 @@
     <string name="send">Send</string>
     <string name="send_copy_to">Send copy to</string>
     <string name="send_share">Send share</string>
+    <string name="sendbutton_description">Send button icon</string>
     <string name="server_not_reachable">Could not load content</string>
     <string name="server_not_reachable_content">The device is likely not connected to the internet</string>
     <string name="set_as">Set As</string>
@@ -898,6 +901,7 @@
     <string name="share_option_required">Please select at least one sharing option before continuing.</string>
     <string name="share_permission_can_edit">Can edit</string>
     <string name="share_permission_file_request">File request</string>
+    <string name="share_permission_secure_file_drop">Secure file drop</string>
     <string name="share_permission_view_only">View only</string>
     <string name="share_permissions">Share permissions</string>
     <string name="share_re_share_permission">Share</string>
@@ -1110,6 +1114,7 @@
     <string name="upload_query_move_foreign_files">Insufficient space prevents copying the selected files into the %1$s folder. Would you like to move them there instead?</string>
     <string name="upload_quota_exceeded">Storage quota exceeded</string>
     <string name="upload_scan_doc_upload">Scan document from camera</string>
+    <string name="upload_sync_conflict">Sync conflict, please resolve manually</string>
     <string name="upload_sync_conflict_check">There might be a conflict from your last upload. Tap to check.</string>
     <string name="upload_sync_conflict_check_error">Could not check for upload conflicts. Please try again.</string>
     <string name="upload_sync_conflict_checking">Checking for upload conflicts…</string>
@@ -1161,6 +1166,7 @@
     <string name="uploads_view_upload_status_failed_localfile_error">Local file not found</string>
     <string name="uploads_view_upload_status_failed_permission_error">Permission error</string>
     <string name="uploads_view_upload_status_failed_ssl_certificate_not_trusted">Untrusted server certificate</string>
+    <string name="uploads_view_upload_status_fetching_server_version">Fetching server version…</string>
     <string name="uploads_view_upload_status_service_interrupted">App terminated</string>
     <string name="uploads_view_upload_status_skip">Skipped</string>
     <string name="uploads_view_upload_status_skip_reason">A file with the same name already exists.</string>

app/src/main/res/values-bg-rBG/strings.xml

@@ -249,6 +249,7 @@
     <string name="drawer_item_notifications">Известия</string>
     <string name="drawer_item_on_device">На устройството</string>
     <string name="drawer_item_personal_files">Лични файлове</string>
+    <string name="drawer_item_recently_modified">Последно преработени</string>
     <string name="drawer_item_shared">Споделени</string>
     <string name="drawer_item_trashbin">Изтрити файлове</string>
     <string name="drawer_item_uploads_list">Качени</string>
@@ -339,6 +340,7 @@
     <string name="file_list_empty_on_device">Свалените файлове и папки ще се показват тук.</string>
     <string name="file_list_empty_recent_files_description">Файловете и папките, които наскоро сте променили, ще се покажат тук.</string>
     <string name="file_list_empty_recent_files_headline">Няма наскоро модифицирани файлове</string>
+    <string name="file_list_empty_recently_modified">Няма модифицирани файлове през последните 7 дни</string>
     <string name="file_list_empty_search">Вероятно е в друга директория?</string>
     <string name="file_list_empty_shared">Споделените файлове и папки ще се показват тук.</string>
     <string name="file_list_empty_shared_headline">Все още нищо не е споделено</string>
@@ -638,6 +640,7 @@
     <string name="select_one_template">Моля, изберете един шаблон </string>
     <string name="select_template">Изберете шаблон</string>
     <string name="send">Изпрати</string>
+    <string name="sendbutton_description">Икона на бутон за изпращане</string>
     <string name="set_as">Задай като</string>
     <string name="set_online_status">Състояние</string>
     <string name="set_picture_as">Задай като</string>
@@ -667,6 +670,7 @@
     <string name="share_no_expiration_date_label">Срок на валидност</string>
     <string name="share_no_password_title">Задайте парола</string>
     <string name="share_permission_can_edit">Може да редактира</string>
+    <string name="share_permission_secure_file_drop">Защитено пускане на файлове</string>
     <string name="share_permission_view_only">Само изглед</string>
     <string name="share_re_share_permission">Споделяне</string>
     <string name="share_read_permission">Прочитане</string>
@@ -827,6 +831,7 @@
     <string name="upload_old_android">Шифроването е възможно само с > = Android 5.0</string>
     <string name="upload_query_move_foreign_files">В папка %1$s няма достатъчно място за копиране на избраните файлове. Желаете ли да бъдат преместени?</string>
     <string name="upload_scan_doc_upload">Сканиране на документ от камера</string>
+    <string name="upload_sync_conflict">Конфликт при синхронизирането, необходимо е да го отстраните ръчно</string>
     <string name="upload_unknown_error">Неизвестна грешка</string>
     <string name="uploader_btn_alternative_text">Избиране</string>
     <string name="uploader_btn_upload_text">Качване</string>
@@ -871,6 +876,7 @@
     <string name="uploads_view_upload_status_failed_localfile_error">Локалният фаил не е намерен</string>
     <string name="uploads_view_upload_status_failed_permission_error">Грешка в правата</string>
     <string name="uploads_view_upload_status_failed_ssl_certificate_not_trusted">Недоверен сървърен сертификат</string>
+    <string name="uploads_view_upload_status_fetching_server_version">Извлича се версията на сървъра ...</string>
     <string name="uploads_view_upload_status_service_interrupted">Приложението бе терминирано</string>
     <string name="uploads_view_upload_status_succeeded">Завършено</string>
     <string name="uploads_view_upload_status_unknown_fail">Неизвестна грешка</string>