Fix conflict

.github/workflows/build.yml

@@ -78,17 +78,10 @@ jobs:
         uses: gradle/actions/setup-gradle@v3
         with:
           cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
-<<<<<<< HEAD
       - name: Assemble ${{ matrix.target }} unsigned apk
         run: ./gradlew clean assemble${{ matrix.target }}Release $CI_GRADLE_ARG_PROPERTIES
       - name: Upload ${{ matrix.target }} unsigned APKs
-        uses: actions/upload-artifact@v3
-=======
-      - name: Assemble GPlay unsigned apk
-        run: ./gradlew clean assembleGplayRelease $CI_GRADLE_ARG_PROPERTIES
-      - name: Upload Gplay unsigned APKs
         uses: actions/upload-artifact@v4
->>>>>>> v1.6.32
         with:
           name: ${{ matrix.target }}-release-unsigned
           path: |

.github/workflows/tests.yml

@@ -44,25 +44,14 @@ jobs:
       #- name: Run screenshot tests
       #  run: ./gradlew verifyScreenshots $CI_GRADLE_ARG_PROPERTIES
 
-<<<<<<< HEAD
       #- name: Archive Screenshot Results on Error
       #  if: failure()
-      #  uses: actions/upload-artifact@v3
+      #  uses: actions/upload-artifact@v4
       #  with:
       #    name: screenshot-results
       #    path: |
       #      **/out/failures/
       #      **/build/reports/tests/*UnitTest/
-=======
-      - name: Archive Screenshot Results on Error
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: screenshot-results
-          path: |
-            **/out/failures/
-            **/build/reports/tests/*UnitTest/
->>>>>>> v1.6.32
 
       - uses: actions/setup-python@v4
         with:

library/ui-strings/src/main/res/values-fr/strings.xml

@@ -2977,12 +2977,8 @@
     <string name="call_unsupported">Appel non pris en charge</string>
     <string name="call_unsupported_matrix_rtc_call">Appel non pris en charge.</string> <!-- Tchap: Use custom string -->
     <string name="microphone_in_use_title">Microphone en service</string>
-<<<<<<< HEAD
-</resources>
-=======
     <string name="error_mas_not_supported_title">Vous ne pouvez plus créer de compte sur %1$s avec cette application</string>
     <string name="error_mas_not_supported_subtitle">Téléchargez %1$s pour utiliser %2$s avec votre compte, ou choisissez un autre serveur d’accueil.</string>
     <string name="view_download_replacement_app_title">Télécharger %1$s</string>
     <string name="view_download_replacement_app_subtitle">Plus rapide, plus sécurisé et fourni avec des outils de collaboration efficaces.</string>
 </resources>
->>>>>>> v1.6.32

vector-app/build.gradle

@@ -37,11 +37,7 @@ ext.versionMinor = 16
 // 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 = 0
-=======
-ext.versionPatch = 32
->>>>>>> v1.6.32
 
 static def getGitTimestamp() {
     def cmd = 'git show -s --format=%ct'

vector-config/src/tchap/res/values/config-features.xml

@@ -4,7 +4,7 @@
     <bool name="tchap_is_key_backup_enabled">true</bool>
     <bool name="tchap_is_thread_enabled">false</bool>
     <bool name="tchap_is_secure_backup_required">false</bool>
-    <bool name="tchap_is_sso_enabled">true</bool>
+    <bool name="tchap_is_sso_enabled">false</bool>
 
     <string-array name="tchap_is_visio_supported_homeservers" translatable="false" />
 </resources>

vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt

@@ -17,11 +17,7 @@ sealed class RoomProfileAction : VectorViewModelAction {
     object ShareRoomProfile : RoomProfileAction()
     object CreateShortcut : RoomProfileAction()
     object RestoreEncryptionState : RoomProfileAction()
-<<<<<<< HEAD
     // TCHAP force to false to deactivate "Never send messages to unverified devices in room"
 //    data class SetEncryptToVerifiedDeviceOnly(val enabled: Boolean) : RoomProfileAction()
-=======
-    data class SetEncryptToVerifiedDeviceOnly(val enabled: Boolean) : RoomProfileAction()
     data class ReportRoom(val reason: String) : RoomProfileAction()
->>>>>>> v1.6.32
 }

vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt

@@ -53,12 +53,8 @@ class RoomProfileController @Inject constructor(
         fun onUploadsClicked()
         fun createShortcut()
         fun onSettingsClicked()
-<<<<<<< HEAD
-        fun onLeaveRoomClicked(isLastAdmin: Boolean)
-=======
         fun onReportRoomClicked()
-        fun onLeaveRoomClicked()
->>>>>>> v1.6.32
+        fun onLeaveRoomClicked(isLastAdmin: Boolean)
         fun onRoomAliasesClicked()
         fun onRoomPermissionsClicked()
         fun onRoomIdClicked()

vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt

@@ -301,9 +301,6 @@ class RoomProfileFragment :
         ShortcutManagerCompat.requestPinShortcut(requireContext(), onShortcutReady.shortcutInfo, null)
     }
 
-<<<<<<< HEAD
-    override fun onLeaveRoomClicked(isLastAdmin: Boolean) {
-=======
     override fun onReportRoomClicked() {
         promptReasonToReportRoom()
     }
@@ -324,8 +321,7 @@ class RoomProfileFragment :
                 .show()
     }
 
-    override fun onLeaveRoomClicked() {
->>>>>>> v1.6.32
+    override fun onLeaveRoomClicked(isLastAdmin: Boolean) {
         val isPublicRoom = roomProfileViewModel.isPublicRoom()
         val message = buildString {
             append(getString(CommonStrings.room_participants_leave_prompt_msg))

vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt

@@ -208,11 +208,8 @@ class RoomProfileViewModel @AssistedInject constructor(
             is RoomProfileAction.ShareRoomProfile -> handleShareRoomProfile()
             RoomProfileAction.CreateShortcut -> handleCreateShortcut()
             RoomProfileAction.RestoreEncryptionState -> restoreEncryptionState()
-<<<<<<< HEAD
             // TCHAP force to false to deactivate "Never send messages to unverified devices in room"
 //            is RoomProfileAction.SetEncryptToVerifiedDeviceOnly -> setEncryptToVerifiedDeviceOnly(action.enabled)
-=======
-            is RoomProfileAction.SetEncryptToVerifiedDeviceOnly -> setEncryptToVerifiedDeviceOnly(action.enabled)
             is RoomProfileAction.ReportRoom -> handleReportRoom(action.reason)
         }
     }
@@ -233,7 +230,6 @@ class RoomProfileViewModel @AssistedInject constructor(
             } finally {
                 _viewEvents.post(RoomProfileViewEvents.DismissLoading)
             }
->>>>>>> v1.6.32
         }
     }