Fix conflicts

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 <!-- Please read [CONTRIBUTING.md](https://github.com/tchapgouv/tchap-android/blob/develop/CONTRIBUTING.md) before submitting your pull request -->
-=======
-<!-- Please read [CONTRIBUTING.md](https://github.com/element-hq/element-android/blob/develop/CONTRIBUTING.md) before submitting your pull request -->
->>>>>>> v1.6.10
 
 ## Type of change
 
@@ -53,21 +49,10 @@ Uncomment this markdown table below and edit the last line `|||`:
 
 - [ ] Changes has been tested on an Android device or Android emulator with API 21
 - [ ] UI change has been tested on both light and dark themes
-<<<<<<< HEAD
 - [ ] Accessibility has been taken into account. See https://github.com/tchapgouv/tchap-android-v2/blob/develop/CONTRIBUTING.md#accessibility
 - [ ] Pull request is based on the develop branch
-- [ ] Pull request updates [TCHAP_CHANGES.md](https://github.com/tchapgouv/tchap-android-v2/blob/develop/TCHAP_CHANGES.md)
 - [ ] Pull request includes a new file under ./changelog.d. See https://github.com/tchapgouv/tchap-android-v2/blob/develop/CONTRIBUTING.md#changelog
 - [ ] Pull request includes screenshots or videos if containing UI changes
 - [ ] Pull request includes a [sign off](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#sign-off)
 - [ ] You've made a self review of your PR
 - [ ] If you have modified the screen flow, or added new screens to the application, you have updated the test [UiAllScreensSanityTest.allScreensTest()](https://github.com/tchapgouv/tchap-android-v2/blob/develop/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt)
-=======
-- [ ] Accessibility has been taken into account. See https://github.com/element-hq/element-android/blob/develop/CONTRIBUTING.md#accessibility
-- [ ] Pull request is based on the develop branch
-- [ ] Pull request includes a new file under ./changelog.d. See https://github.com/element-hq/element-android/blob/develop/CONTRIBUTING.md#changelog
-- [ ] Pull request includes screenshots or videos if containing UI changes
-- [ ] Pull request includes a [sign off](https://matrix-org.github.io/synapse/latest/development/contributing_guide.html#sign-off)
-- [ ] You've made a self review of your PR
-- [ ] If you have modified the screen flow, or added new screens to the application, you have updated the test [UiAllScreensSanityTest.allScreensTest()](https://github.com/element-hq/element-android/blob/main/vector/src/androidTest/java/im/vector/app/ui/UiAllScreensSanityTest.kt#L73)
->>>>>>> v1.6.10

.github/workflows/build.yml

@@ -99,12 +99,8 @@ jobs:
       - name: Execute exodus-standalone
         uses: docker://exodusprivacy/exodus-standalone:latest
         with:
-<<<<<<< HEAD
-          args: /github/workspace/${{ env.TARGET_FOLDER }}/release/${{ steps.list-apks.outputs.FIRST_APK_NAME }} -j -o /github/workspace/exodus.json
-=======
           # Don't fail when finding trackers so they can be reported later
-          args: /github/workspace/gplay/release/vector-gplay-universal-release-unsigned.apk -j -o /github/workspace/exodus.json -e 0
->>>>>>> v1.6.10
+          args: /github/workspace/${{ env.TARGET_FOLDER }}/release/${{ steps.list-apks.outputs.FIRST_APK_NAME }} -j -o /github/workspace/exodus.json -e 0
       - name: Upload exodus json report
         uses: actions/upload-artifact@v3
         with:

.github/workflows/nightly.yml

@@ -13,7 +13,7 @@ env:
 jobs:
   nightly:
     # Tchap: Skip nightly
-    if: github.repository == 'vector-im/element-android'
+    if: github.repository == 'element-hq/element-android'
     name: Build and publish nightly Gplay APK to Firebase
     runs-on: ubuntu-latest
     steps:

.github/workflows/post-pr.yml

@@ -38,7 +38,7 @@ jobs:
       matrix:
         api-level: [ 28 ]
     # Tchap: Disabled for now
-    if: github.repository == 'vector-im/element-android'
+    if: github.repository == 'element-hq/element-android'
     # No concurrency required, runs every time on a schedule.
     steps:
       - uses: actions/checkout@v3
@@ -94,7 +94,7 @@ jobs:
       - should-i-run
       - ui-tests
     # Tchap: Disabled for now
-    if: github.repository == 'vector-im/element-android' && always() && (needs.should-i-run.result == 'success' ) && (needs.ui-tests.result != 'success')
+    if: github.repository == 'element-hq/element-android' && always() && (needs.should-i-run.result == 'success' ) && (needs.ui-tests.result != 'success')
     # No concurrency required, runs every time on a schedule.
     steps:
       - uses: michaelkaye/matrix-hookshot-action@v1.0.0

AUTHORS.md

@@ -1,32 +1,19 @@
-<<<<<<< HEAD
-A full developer contributors list can be found [here](https://github.com/dinsic-pim/tchap-android/graphs/contributors).
-=======
-A full developer contributors list can be found [here](https://github.com/element-hq/element-android/graphs/contributors).
->>>>>>> v1.6.10
+A full developer contributors list can be found [here](https://github.com/tchapgouv/tchap-android/graphs/contributors).
 
 # Tchap team:
 
 Even if we try to be able to work on all the functionalities, we have more knowledge about what we have developed ourselves.
 
-## [Giomfo](https://github.com/giomfo): Product manager, Android team leader
+## [Yostyle](https://github.com/yostyle): Android team leader
 
-[@Giom:matrix.org](https://matrix.to/#/@Giom:matrix.org)
-- Android team leader and project manager, Android developer, GitHub community manager.
+[@yoanp:matrix.org](https://matrix.to/#/@yoanp:matrix.org)
+- Android team leader, Android developer, GitHub community manager.
 - Specialist of the account creation, and many other fun features.
 - Reviewing and polishing developed features, code quality manager, PRs reviewer, GitHub community manager.
 - Release manager on the Play Store
 
-## [Claire](https://github.com/Claire1817): Android developer
-
-[@claire.1817:matrix.org](https://matrix.to/#/@claire.1817:matrix.org)
-- Android developer
-
-## [Florian](https://github.com/Florian14): Android developer
+## [NicolasBuquet](https://github.com/NicolasBuquet): Android developer
 
-[@frenaud14:matrix.org](https://matrix.to/#/@frenaud14:matrix.org)
-- Android developer
-
-## [Yostyle](https://github.com/yostyle): Android developer
-
-[@yoanp:matrix.org](https://matrix.to/#/@yoanp:matrix.org)
-- Android developer
+[@nicolas_buquet:matrix.org](https://matrix.to/#/@nicolas_buquet:matrix.org)
+- Android developer.
+- Reviewing and polishing developed features, PRs reviewer.

CONTRIBUTING.md

@@ -73,7 +73,7 @@ identifying this kind of changes and simplifying conflict resolution during the
 Also, add an explanation about why the changes are necessary for Tchap or why the behaviour is different from Element.
 
 Please consider staying aligned as much as possible with the Element codebase, if a change or an improvement can be relevant for Element, prefer to add a
-contribution in the [Element repository](https://github.com/vector-im/element-android).
+contribution in the [Element repository](https://github.com/element-hq/element-android).
 
 ### Changelog
 

README.md

@@ -1,32 +1,12 @@
-<<<<<<< HEAD
 # Tchap Android
 
 Tchap Android is an Android Matrix Client provided by [DINUM](https://tchap.beta.gouv.fr/). The app can be run on every Android devices with Android OS Lollipop and more (API 21).
-=======
-[![Latest build](https://github.com/element-hq/element-android/actions/workflows/build.yml/badge.svg?query=branch%3Adevelop)](https://github.com/element-hq/element-android/actions/workflows/build.yml?query=branch%3Adevelop)
-[![Weblate](https://translate.element.io/widgets/element-android/-/svg-badge.svg)](https://translate.element.io/engage/element-android/?utm_source=widget)
-[![Element Android Matrix room #element-android:matrix.org](https://img.shields.io/matrix/element-android:matrix.org.svg?label=%23element-android:matrix.org&logo=matrix&server_fqdn=matrix.org)](https://matrix.to/#/#element-android:matrix.org)
-[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=vector-im_element-android&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=vector-im_element-android)
-[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=vector-im_element-android&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=vector-im_element-android)
-[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=vector-im_element-android&metric=bugs)](https://sonarcloud.io/summary/new_code?id=vector-im_element-android)
-
-# Element Android
-
-Element Android is an Android Matrix Client provided by [Element](https://element.io/). The app can be run on every Android devices with Android OS Lollipop and more (API 21).
-
-It is a total rewrite of [Riot-Android](https://github.com/element-hq/riot-android) with a new user experience.
-
-[<img src="resources/img/google-play-badge.png" alt="Get it on Google Play" height="60">](https://play.google.com/store/apps/details?id=im.vector.app)
-[<img src="resources/img/f-droid-badge.png" alt="Get it on F-Droid" height="60">](https://f-droid.org/app/im.vector.app)
-
-Build of develop branch: [![GitHub Action](https://github.com/element-hq/element-android/actions/workflows/build.yml/badge.svg?query=branch%3Adevelop)](https://github.com/element-hq/element-android/actions/workflows/build.yml?query=branch%3Adevelop) Nightly test status: [![allScreensTest](https://github.com/element-hq/element-android/actions/workflows/nightly.yml/badge.svg)](https://github.com/element-hq/element-android/actions/workflows/nightly.yml)
->>>>>>> v1.6.10
 
 [<img src="resources/img/google-play-badge.png" alt="Get it on Google Play" height="60">](https://play.google.com/store/apps/details?id=fr.gouv.tchap.a)
 
 # New Android SDK
 
-Tchap is based on [Element](https://github.com/vector-im/element-android) with a new Android [SDK](https://github.com/matrix-org/matrix-android-sdk2) fully written in Kotlin. In order to make the early development as fast as possible, Tchap and the new SDK currently share the same git repository.
+Tchap is based on [Element](https://github.com/element-hq/element-android) with a new Android [SDK](https://github.com/matrix-org/matrix-android-sdk2) fully written in Kotlin. In order to make the early development as fast as possible, Tchap and the new SDK currently share the same git repository.
 
 # Releases to app stores
 
@@ -37,14 +17,8 @@ There is some delay between when a release is created and when it appears in the
 
 If you would like to receive releases more quickly (bearing in mind that they may not be stable) you have a number of options:
 
-<<<<<<< HEAD
 1. [Sign up to receive beta releases](https://play.google.com/apps/testing/fr.gouv.tchap.a) via the Google Play Store.
 2. Install a [release APK](https://github.com/tchapgouv/tchap-android/releases) directly - download the relevant .apk file. Note: These are not the store versions, so you may have to uninstall the previous Tchap version before. Take care to properly logout and export your encrypted keys before.
-=======
-1. [Sign up to receive beta releases](https://play.google.com/apps/testing/im.vector.app) via the Google Play Store.
-2. Install a [release APK](https://github.com/element-hq/element-android/releases) directly - download the relevant .apk file and allow installing from untrusted sources in your device settings.  Note: these releases are the Google Play version, which depend on some Google services.  If you prefer to avoid that, try the latest dev builds, and choose the F-Droid version.
-3. If you're really brave, install the [very latest dev build](https://github.com/element-hq/element-android/actions/workflows/build.yml?query=branch%3Adevelop) - pick a build, then click on `Summary` to download the APKs from there: `vector-Fdroid-debug` and `vector-Gplay-debug` contains the APK for the desired store. Each file contains 5 APKs. 4 APKs for every supported specific architecture of device. In doubt you can install the `universal` APK.
->>>>>>> v1.6.10
 
 ## Contributing
 
@@ -58,9 +32,5 @@ Also [this documentation](./docs/_developer_onboarding.md) can hopefully help de
 
 Issues are triaged by community members and the Android App Team, following the [triage process](https://github.com/element-hq/element-meta/wiki/Triage-process).
 
-<<<<<<< HEAD
-We use [issue labels](https://github.com/vector-im/element-meta/wiki/Issue-labelling) to sort all incoming issues.
-=======
 We use [issue labels](https://github.com/element-hq/element-meta/wiki/Issue-labelling) to sort all incoming issues.
 
->>>>>>> v1.6.10

build.gradle

@@ -211,17 +211,10 @@ sonar {
         property "sonar.host.url", "https://sonarcloud.io"
         property "sonar.projectVersion", project(":vector").android.defaultConfig.versionName
         property "sonar.sourceEncoding", "UTF-8"
-<<<<<<< HEAD
         property "sonar.links.homepage", "https://github.com/tchapgouv/tchap-android/"
         property "sonar.links.ci", "https://github.com/tchapgouv/tchap-android/actions"
         property "sonar.links.scm", "https://github.com/tchapgouv/tchap-android/"
         property "sonar.links.issue", "https://github.com/tchapgouv/tchap-android/issues"
-=======
-        property "sonar.links.homepage", "https://github.com/element-hq/element-android/"
-        property "sonar.links.ci", "https://github.com/element-hq/element-android/actions"
-        property "sonar.links.scm", "https://github.com/element-hq/element-android/"
-        property "sonar.links.issue", "https://github.com/element-hq/element-android/issues"
->>>>>>> v1.6.10
         property "sonar.organization", "new_vector_ltd_organization"
         property "sonar.java.coveragePlugin", "jacoco"
         property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/generateCoverageReport/generateCoverageReport.xml"

matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/crypto/RustCryptoService.kt

@@ -135,11 +135,7 @@ internal class RustCryptoService @Inject constructor(
         private val getRoomUserIds: GetRoomUserIdsUseCase,
         private val outgoingRequestsProcessor: OutgoingRequestsProcessor,
         private val matrixConfiguration: MatrixConfiguration,
-<<<<<<< HEAD
-        private val rateLimiter: PerSessionBackupQueryRateLimiter,
-=======
         private val perSessionBackupQueryRateLimiter: PerSessionBackupQueryRateLimiter,
->>>>>>> v1.6.10
 ) : CryptoService {
 
     private val isStarting = AtomicBoolean(false)
@@ -503,14 +499,9 @@ internal class RustCryptoService @Inject constructor(
         return try {
             olmMachine.decryptRoomEvent(event)
         } catch (mxCryptoError: MXCryptoError) {
-<<<<<<< HEAD
-            // Tchap: try to perform a lazy migration from legacy store if there is no other session.
-            if (mxCryptoError is MXCryptoError.Base && mxCryptoError.errorType == MXCryptoError.ErrorType.UNKNOWN_INBOUND_SESSION_ID) {
-=======
             if (mxCryptoError is MXCryptoError.Base && (
                             mxCryptoError.errorType == MXCryptoError.ErrorType.UNKNOWN_INBOUND_SESSION_ID ||
                                     mxCryptoError.errorType == MXCryptoError.ErrorType.UNKNOWN_MESSAGE_INDEX)) {
->>>>>>> v1.6.10
                 Timber.v("Try to perform a lazy migration from legacy store")
                 /**
                  * It's a bit hacky, check how this can be better integrated with rust?
@@ -520,19 +511,12 @@ internal class RustCryptoService @Inject constructor(
                 val sessionId = content.sessionId
                 val senderKey = content.senderKey
                 if (roomId != null && sessionId != null) {
-<<<<<<< HEAD
-=======
                     // try to perform a lazy migration from legacy store
->>>>>>> v1.6.10
                     val legacy = tryOrNull("Failed to access legacy crypto store") {
                         cryptoStore.getInboundGroupSession(sessionId, senderKey.orEmpty())
                     }
                     if (legacy == null || olmMachine.importRoomKey(legacy).isFailure) {
-<<<<<<< HEAD
-                        rateLimiter.tryFromBackupIfPossible(sessionId, roomId)
-=======
                         perSessionBackupQueryRateLimiter.tryFromBackupIfPossible(sessionId, roomId)
->>>>>>> v1.6.10
                     }
                 }
             }

tools/danger/dangerfile.js

@@ -72,11 +72,7 @@ const signOff = "Signed-off-by:"
 // Please add new names following the alphabetical order.
 const allowList = [
     "dependabot[bot]",
-    "Florian14",
-    "giomfo",
     "yostyle",
-    "jdauphant",
-    "appndigital",
     "NicolasBuquet"
 ]
 
@@ -110,17 +106,9 @@ if (github.requested_reviewers.users.length == 0 && !pr.draft) {
 }
 
 // Check that translations have not been modified by developers
-<<<<<<< HEAD
-// Tchap ; deactivate translation file checking.
-// if (user != "RiotTranslateBot") {
-//    if (editedFiles.some(file => file.endsWith("strings.xml") && !file.endsWith("values/strings.xml"))) {
-//        fail("Some translation files have been edited. Only user `RiotTranslateBot` (i.e. translations coming from Weblate) is allowed to do that.\nPlease read more about translations management [in the doc](https://github.com/vector-im/element-android/blob/develop/CONTRIBUTING.md#internationalisation).")
-//    }
-// }
-=======
-if (user != "RiotTranslateBot") {
-   if (editedFiles.some(file => file.endsWith("strings.xml") && !file.endsWith("values/strings.xml"))) {
-       fail("Some translation files have been edited. Only user `RiotTranslateBot` (i.e. translations coming from Weblate) is allowed to do that.\nPlease read more about translations management [in the doc](https://github.com/element-hq/element-android/blob/develop/CONTRIBUTING.md#internationalisation).")
-   }
-}
->>>>>>> v1.6.10
+// Tchap: deactivate translation file checking.
+//if (user != "RiotTranslateBot") {
+//   if (editedFiles.some(file => file.endsWith("strings.xml") && !file.endsWith("values/strings.xml"))) {
+//       fail("Some translation files have been edited. Only user `RiotTranslateBot` (i.e. translations coming from Weblate) is allowed to do that.\nPlease read more about translations management [in the doc](https://github.com/element-hq/element-android/blob/develop/CONTRIBUTING.md#internationalisation).")
+//   }
+//}

towncrier.toml

@@ -4,11 +4,7 @@
     filename = "TCHAP_CHANGES.md"
     name = "Changes in Tchap"
     template = "tools/towncrier/template.md"
-<<<<<<< HEAD
     issue_format = "[#{issue}](https://github.com/tchapgouv/tchap-android/issues/{issue})"
-=======
-    issue_format = "[#{issue}](https://github.com/element-hq/element-android/issues/{issue})"
->>>>>>> v1.6.10
 
     [[tool.towncrier.type]]
         directory = "feature"

vector-app/build.gradle

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