diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 316f03fe5e..e74dcbf00c 100644 --- a/.github/workflows/build.yml +++ b/.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: | diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 708df33b42..986def8362 100644 --- a/.github/workflows/tests.yml +++ b/.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: diff --git a/library/ui-strings/src/main/res/values-fr/strings.xml b/library/ui-strings/src/main/res/values-fr/strings.xml index 42739cf183..bc51ac5549 100644 --- a/library/ui-strings/src/main/res/values-fr/strings.xml +++ b/library/ui-strings/src/main/res/values-fr/strings.xml @@ -2977,12 +2977,8 @@ Appel non pris en charge Appel non pris en charge. Microphone en service -<<<<<<< HEAD - -======= Vous ne pouvez plus créer de compte sur %1$s avec cette application Téléchargez %1$s pour utiliser %2$s avec votre compte, ou choisissez un autre serveur d’accueil. Télécharger %1$s Plus rapide, plus sécurisé et fourni avec des outils de collaboration efficaces. ->>>>>>> v1.6.32 diff --git a/vector-app/build.gradle b/vector-app/build.gradle index 24f19c0209..4919d244ef 100644 --- a/vector-app/build.gradle +++ b/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' diff --git a/vector-config/src/tchap/res/values/config-features.xml b/vector-config/src/tchap/res/values/config-features.xml index 612c7a050d..9e80107d3a 100755 --- a/vector-config/src/tchap/res/values/config-features.xml +++ b/vector-config/src/tchap/res/values/config-features.xml @@ -4,7 +4,7 @@ true false false - true + false diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt index bff9c713a4..12e264d318 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileAction.kt +++ b/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 } diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt index 5ab5a7642e..e076899623 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileController.kt +++ b/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() diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt index a6fb2169ec..241269e1f2 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileFragment.kt +++ b/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)) diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt b/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt index 5bd70a5955..7e2b468781 100644 --- a/vector/src/main/java/im/vector/app/features/roomprofile/RoomProfileViewModel.kt +++ b/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 } }