merge fix opening file

tchapgouv · Jun 4, 2024 · 872bffe · 872bffe
1 parent d69fab3
commit 872bffe
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 100 deletions.
diff --git a/library/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/AudioPicker.kt
@@ -31,10 +31,6 @@ class AudioPicker : Picker<MultiPickerAudioType>() {
      * Returns selected audio files or empty list if user did not select any files.
      */
     override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerAudioType> {
-<<<<<<< HEAD
-        // TCHAP Grant permission to access the selected file.
-=======
->>>>>>> v1.6.16
         return getSelectedUriList(context, data).mapNotNull { selectedUri ->
             selectedUri.toMultiPickerAudioType(context)
         }

diff --git a/library/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/FilePicker.kt
@@ -41,10 +41,6 @@ class FilePicker : Picker<MultiPickerBaseType>() {
      * Returns selected files or empty list if user did not select any files.
      */
     override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerBaseType> {
-<<<<<<< HEAD
-        // TCHAP Grant permission to access the selected file.
-=======
->>>>>>> v1.6.16
         return getSelectedUriList(context, data).mapNotNull { selectedUri ->
             val type = context.contentResolver.getType(selectedUri)
 

diff --git a/library/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/ImagePicker.kt
@@ -31,10 +31,6 @@ class ImagePicker : Picker<MultiPickerImageType>() {
      * Returns selected image files or empty list if user did not select any files.
      */
     override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerImageType> {
-<<<<<<< HEAD
-        // TCHAP Grant permission to access the selected file.
-=======
->>>>>>> v1.6.16
         return getSelectedUriList(context, data).mapNotNull { selectedUri ->
             selectedUri.toMultiPickerImageType(context)
         }

diff --git a/library/multipicker/src/main/java/im/vector/lib/multipicker/MediaPicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/MediaPicker.kt
@@ -33,10 +33,6 @@ class MediaPicker : Picker<MultiPickerBaseMediaType>() {
      * Returns selected image/video files or empty list if user did not select any files.
      */
     override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerBaseMediaType> {
-<<<<<<< HEAD
-        // TCHAP Grant permission to access the selected file.
-=======
->>>>>>> v1.6.16
         return getSelectedUriList(context, data).mapNotNull { selectedUri ->
             val mimeType = context.contentResolver.getType(selectedUri)
 

diff --git a/library/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/Picker.kt
@@ -59,13 +59,9 @@ abstract class Picker<T> {
         uriList.forEach {
             for (resolveInfo in resInfoList) {
                 val packageName: String = resolveInfo.activityInfo.packageName
-<<<<<<< HEAD
-                // TCHAP Replace implicit intent by an explicit to fix crash on some devices like Xiaomi.
-=======
 
                 // Replace implicit intent by an explicit to fix crash on some devices like Xiaomi.
                 // see https://juejin.cn/post/7031736325422186510
->>>>>>> v1.6.16
                 try {
                     context.grantUriPermission(packageName, it, Intent.FLAG_GRANT_READ_URI_PERMISSION)
                 } catch (e: Exception) {
@@ -119,12 +115,6 @@ abstract class Picker<T> {
                 }
             }
         }
-<<<<<<< HEAD
-        // TCHAP Grant permission to access the selected file.
-        val packageName = context.applicationContext.packageName
-        return selectedUriList.onEach { context.grantUriPermission(packageName, it, Intent.FLAG_GRANT_READ_URI_PERMISSION) }
-=======
         return selectedUriList.onEach { context.grantUriPermission(context.applicationContext.packageName, it, Intent.FLAG_GRANT_READ_URI_PERMISSION) }
->>>>>>> v1.6.16
     }
 }
diff --git a/library/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt b/library/multipicker/src/main/java/im/vector/lib/multipicker/VideoPicker.kt
@@ -31,10 +31,6 @@ class VideoPicker : Picker<MultiPickerVideoType>() {
      * Returns selected video files or empty list if user did not select any files.
      */
     override fun getSelectedFiles(context: Context, data: Intent?): List<MultiPickerVideoType> {
-<<<<<<< HEAD
-        // TCHAP Grant permission to access the selected file.
-=======
->>>>>>> v1.6.16
         return getSelectedUriList(context, data).mapNotNull { selectedUri ->
             selectedUri.toMultiPickerVideoType(context)
         }

diff --git a/...roid/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt b/...roid/src/main/java/org/matrix/android/sdk/internal/session/content/UploadContentWorker.kt
@@ -120,10 +120,6 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
                     .also {
                         Timber.e("## Send: Work cancelled by user")
 
-<<<<<<< HEAD
-                        // TCHAP Revoke read permission to the local file.
-=======
->>>>>>> v1.6.16
                         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                             context.revokeUriPermission(context.packageName, params.attachment.queryUri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
                         } else {
@@ -411,10 +407,6 @@ internal class UploadContentWorker(val context: Context, params: WorkerParameter
         return Result.success(WorkerParamsFactory.toData(sendParams)).also {
             Timber.v("## handleSuccess $attachmentUrl, work is stopped $isStopped")
 
-<<<<<<< HEAD
-            // TCHAP Revoke read permission to the local file.
-=======
->>>>>>> v1.6.16
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 context.revokeUriPermission(context.packageName, params.attachment.queryUri, Intent.FLAG_GRANT_READ_URI_PERMISSION)
             } else {

diff --git a/vector-app/build.gradle b/vector-app/build.gradle
@@ -37,11 +37,7 @@ ext.versionMinor = 11
 // Note: even values are reserved for regular release, odd values for hotfix release.
 // When creating a hotfix, you should decrease the value, since the current value
 // is the value for the next regular release.
-<<<<<<< HEAD
 ext.versionPatch = 6
-=======
-ext.versionPatch = 16
->>>>>>> v1.6.16
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'

diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
@@ -167,40 +167,30 @@
 
         <!-- Activity to intercept links coming from a web instance -->
         <!-- exported="true" is required to handle android.intent.action.VIEW for URL redirection-->
-        <!--        <activity-->
-        <!--            android:name=".features.link.LinkHandlerActivity"-->
-        <!--            android:enabled="true"-->
-        <!--            android:exported="true">-->
-        <!--            <intent-filter>-->
-        <!--                <action android:name="android.intent.action.VIEW" />-->
-
-        <!--                <category android:name="android.intent.category.DEFAULT" />-->
-        <!--                <category android:name="android.intent.category.BROWSABLE" />-->
-
-<<<<<<< HEAD
-        <!--                <data android:scheme="https" />-->
-        <!--                <data android:host="riot.im" />-->
-        <!--                <data android:host="app.element.io" />-->
-        <!--                <data android:host="mobile.element.io" />-->
-        <!--                <data android:host="develop.element.io" />-->
-        <!--                <data android:host="staging.element.io" />-->
-        <!--            </intent-filter>-->
-        <!--        </activity>-->
-=======
-                <data android:scheme="https" />
-                <data android:host="riot.im" />
-            </intent-filter>
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="https" />
-                <data android:host="*.element.io" />
-            </intent-filter>
-        </activity>
->>>>>>> v1.6.16
+        <!-- TCHAP disable element link -->
+<!--        <activity-->
+<!--            android:name=".features.link.LinkHandlerActivity"-->
+<!--            android:enabled="true"-->
+<!--            android:exported="true">-->
+<!--            <intent-filter>-->
+<!--                <action android:name="android.intent.action.VIEW" />-->
+
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--                <category android:name="android.intent.category.BROWSABLE" />-->
+
+<!--                <data android:scheme="https" />-->
+<!--                <data android:host="riot.im" />-->
+<!--            </intent-filter>-->
+<!--            <intent-filter android:autoVerify="true">-->
+<!--                <action android:name="android.intent.action.VIEW" />-->
+
+<!--                <category android:name="android.intent.category.DEFAULT" />-->
+<!--                <category android:name="android.intent.category.BROWSABLE" />-->
+
+<!--                <data android:scheme="https" />-->
+<!--                <data android:host="*.element.io" />-->
+<!--            </intent-filter>-->
+<!--        </activity>-->
 
         <!-- Activity alias for matrix.to or element permalinks -->
         <!-- exported="true" is required to handle android.intent.action.VIEW for URL redirection-->

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailViewEvents.kt
@@ -66,10 +66,6 @@ sealed class RoomDetailViewEvents : VectorViewEvents {
             val mimeType: String?
     ) : RoomDetailViewEvents()
 
-<<<<<<< HEAD
-    // TCHAP Revoke read permission to the local file.
-=======
->>>>>>> v1.6.16
     data class RevokeFilePermission(
             val uri: Uri
     ) : RoomDetailViewEvents()

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineFragment.kt
@@ -1606,21 +1606,13 @@ class TimelineFragment :
 
     private fun handleCancelSend(action: EventSharedAction.Cancel) {
         if (action.force) {
-<<<<<<< HEAD
-            // TCHAP Revoke read permission to the local file.
-=======
->>>>>>> v1.6.16
             timelineViewModel.handle(RoomDetailAction.CancelSend(action.event, true))
         } else {
             MaterialAlertDialogBuilder(requireContext())
                     .setTitle(R.string.dialog_title_confirmation)
                     .setMessage(getString(R.string.event_status_cancel_sending_dialog_message))
                     .setNegativeButton(R.string.no, null)
                     .setPositiveButton(R.string.yes) { _, _ ->
-<<<<<<< HEAD
-                        // TCHAP Revoke read permission to the local file.
-=======
->>>>>>> v1.6.16
                         timelineViewModel.handle(RoomDetailAction.CancelSend(action.event, false))
                     }
                     .show()

diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/TimelineViewModel.kt
@@ -1101,10 +1101,6 @@ class TimelineViewModel @AssistedInject constructor(
 
     private fun handleCancel(action: RoomDetailAction.CancelSend) {
         if (room == null) return
-<<<<<<< HEAD
-        // TCHAP Revoke read permission to the local file.
-=======
->>>>>>> v1.6.16
         // State must be in one of the sending states
         if (action.force || action.event.root.sendState.isSending()) {
             room.sendService().cancelSend(action.event.eventId)

diff --git a/...n/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt b/...n/java/im/vector/app/features/home/room/detail/timeline/action/MessageActionsViewModel.kt
@@ -313,10 +313,6 @@ class MessageActionsViewModel @AssistedInject constructor(
     private fun ArrayList<EventSharedAction>.addActionsForSendingState(timelineEvent: TimelineEvent) {
         // TODO is uploading attachment?
         if (canCancel(timelineEvent)) {
-<<<<<<< HEAD
-            // TCHAP Revoke read permission to the local file.
-=======
->>>>>>> v1.6.16
             add(EventSharedAction.Cancel(timelineEvent, false))
         }
     }
@@ -325,10 +321,6 @@ class MessageActionsViewModel @AssistedInject constructor(
         // If sent but not synced (synapse stuck at bottom bug)
         // Still offer action to cancel (will only remove local echo)
         timelineEvent.root.eventId?.let {
-<<<<<<< HEAD
-            // TCHAP Revoke read permission to the local file.
-=======
->>>>>>> v1.6.16
             add(EventSharedAction.Cancel(timelineEvent, true))
         }