Fix conflicts

.github/workflows/build.yml

@@ -31,13 +31,8 @@ jobs:
  with:
  # https://github.com/actions/checkout/issues/881
  ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
-<<<<<<< HEAD
- - name: Use JDK 17 # TCHAP Migrate to Java version 17 to support the new version of webrtc library
- uses: actions/setup-java@v3
-=======
  - name: Use JDK 17
  uses: actions/setup-java@v4
->>>>>>> v1.6.20
  with:
  distribution: 'temurin' # See 'Supported distributions' for available options
  java-version: '17'
@@ -69,22 +64,12 @@ jobs:
  group: ${{ github.ref == 'refs/head/main' && format('build-release-apk-main-{0}-{1}', github.sha, matrix.target) || startsWith(github.ref, 'refs/tags/tchap_v') && format('build-release-apk-tag-{0}-{1}', github.sha, matrix.target) }}
  cancel-in-progress: ${{ github.ref != 'refs/head/main' && !startsWith(github.ref, 'refs/tags/tchap_v') }}
  steps:
-<<<<<<< HEAD
- - uses: actions/checkout@v3
- # TCHAP stay on current branch
- # with:
- # https://github.com/actions/checkout/issues/881
- # ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.sha }}
- - name: Use JDK 17 # TCHAP Migrate to Java version 17 to support the new version of webrtc library
- uses: actions/setup-java@v3
-=======
  - uses: actions/checkout@v4
- with:
+ # with:
  # https://github.com/actions/checkout/issues/881
- ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
+ # ref: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.sha || github.ref }}
  - name: Use JDK 17
  uses: actions/setup-java@v4
->>>>>>> v1.6.20
  with:
  distribution: 'temurin' # See 'Supported distributions' for available options
  java-version: '17'

.github/workflows/danger.yml

@@ -7,17 +7,14 @@ jobs:
  runs-on: ubuntu-latest
  name: Danger
  steps:
-<<<<<<< HEAD
+ # TCHAP use github app token
  - name: Generate token
  id: generate_token
  uses: tibdex/github-app-token@v1
  with:
  app_id: ${{ secrets.APP_ID_DANGERBOT }}
  private_key: ${{ secrets.APP_PEM_DANGERBOT }}
- - uses: actions/checkout@v3
-=======
  - uses: actions/checkout@v4
->>>>>>> v1.6.20
  - run: |
  npm install --save-dev @babel/plugin-transform-flow-strip-types
  - name: Danger

.github/workflows/quality.yml

@@ -7,11 +7,7 @@ on:
 
 # Enrich gradle.properties for CI/CD
 env:
-<<<<<<< HEAD
- GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError" -XX:MaxMetaspaceSize=512m -Dkotlin.daemon.jvm.options="-Xmx2g" -Dkotlin.incremental=false
-=======
  GRADLE_OPTS: -Dorg.gradle.jvmargs="-Xmx3072m -Dfile.encoding=UTF-8 -XX:+HeapDumpOnOutOfMemoryError -XX:MaxMetaspaceSize=1g" -Dkotlin.daemon.jvm.options="-Xmx2560m" -Dkotlin.incremental=false
->>>>>>> v1.6.20
  CI_GRADLE_ARG_PROPERTIES: --stacktrace -PpreDexEnable=false --max-workers 2 --no-daemon
 
 jobs:
@@ -51,20 +47,12 @@ jobs:
  group: ${{ github.ref == 'refs/heads/main' && format('lint-main-{0}', github.sha) || github.ref == 'refs/heads/develop' && format('lint-develop-{0}', github.sha) || format('lint-{0}', github.ref) }}
  cancel-in-progress: true
  steps:
-<<<<<<< HEAD
  - name: Generate token
  id: generate_token
  uses: tibdex/github-app-token@v1
  with:
  app_id: ${{ secrets.APP_ID_DANGERBOT }}
  private_key: ${{ secrets.APP_PEM_DANGERBOT }}
- - uses: actions/checkout@v3
- - name: Use JDK 17 # TCHAP Migrate to Java version 17 to support the new version of webrtc library
- uses: actions/setup-java@v3
- with:
- distribution: 'temurin' # See 'Supported distributions' for available options
- java-version: '17'
-=======
  - uses: actions/checkout@v4
  - name: Use JDK 17
  uses: actions/setup-java@v4
@@ -75,7 +63,6 @@ jobs:
  uses: gradle/actions/setup-gradle@v3
  with:
  cache-read-only: ${{ github.ref != 'refs/heads/develop' }}
->>>>>>> v1.6.20
  - name: Run ktlint
  run: |
  ./gradlew ktlintCheck $CI_GRADLE_ARG_PROPERTIES --continue

dependencies.gradle

@@ -1,18 +1,10 @@
 ext.versions = [
  'minSdk' : 21,
-<<<<<<< HEAD
- 'compileSdk' : 33,
- 'targetSdk' : 33,
- // TCHAP Migrate to Java version 17 to support the new version of webrtc library
- 'sourceCompat' : JavaVersion.VERSION_17,
- 'targetCompat' : JavaVersion.VERSION_17,
-=======
  'compileSdk' : 34,
  'targetSdk' : 34,
  'sourceCompat' : JavaVersion.VERSION_17,
  'targetCompat' : JavaVersion.VERSION_17,
  'jvmTarget' : "17",
->>>>>>> v1.6.20
 ]
 
 def gradle = "8.4.2"

library/attachment-viewer/build.gradle

@@ -49,11 +49,7 @@ android {
  targetCompatibility versions.targetCompat
  }
  kotlinOptions {
-<<<<<<< HEAD
- jvmTarget = "17" // TCHAP Migrate to Java version 17 to support the new version of webrtc library
-=======
  jvmTarget = versions.jvmTarget
->>>>>>> v1.6.20
  }
 
  buildFeatures {

library/core-utils/build.gradle

@@ -43,11 +43,7 @@ android {
  }
 
  kotlinOptions {
-<<<<<<< HEAD
- jvmTarget = "17" // TCHAP Migrate to Java version 17 to support the new version of webrtc library
-=======
  jvmTarget = versions.jvmTarget
->>>>>>> v1.6.20
  freeCompilerArgs += [
  "-opt-in=kotlin.RequiresOptIn"
  ]

library/external/autocomplete/build.gradle

@@ -17,11 +17,7 @@ android {
  }
 
  kotlinOptions {
-<<<<<<< HEAD
- jvmTarget = "17" // TCHAP Migrate to Java version 17 to support the new version of webrtc library
-=======
  jvmTarget = versions.jvmTarget
->>>>>>> v1.6.20
  }
 }
 

library/external/dialpad/build.gradle

@@ -17,11 +17,7 @@ android {
  }
 
  kotlinOptions {
-<<<<<<< HEAD
- jvmTarget = "17" // TCHAP Migrate to Java version 17 to support the new version of webrtc library
-=======
  jvmTarget = versions.jvmTarget
->>>>>>> v1.6.20
  }
 }
 

library/external/jsonviewer/build.gradle

@@ -42,11 +42,7 @@ android {
  }
 
  kotlinOptions {
-<<<<<<< HEAD
- jvmTarget = "17" // TCHAP Migrate to Java version 17 to support the new version of webrtc library
-=======
  jvmTarget = versions.jvmTarget
->>>>>>> v1.6.20
  }
 }
 

library/multipicker/build.gradle

@@ -43,11 +43,7 @@ android {
  }
 
  kotlinOptions {
-<<<<<<< HEAD
- jvmTarget = "17" // TCHAP Migrate to Java version 17 to support the new version of webrtc library
-=======
  jvmTarget = versions.jvmTarget
->>>>>>> v1.6.20
  }
 }
 

library/ui-strings/build.gradle

@@ -19,11 +19,7 @@ android {
  }
 
  kotlinOptions {
-<<<<<<< HEAD
- jvmTarget = "17" // TCHAP Migrate to Java version 17 to support the new version of webrtc library
-=======
  jvmTarget = versions.jvmTarget
->>>>>>> v1.6.20
  }
 }
 

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

@@ -2553,7 +2553,7 @@
  <string name="ftue_auth_new_password_title">Choisissez un nouveau mot de passe</string>
  <string name="ftue_auth_new_password_entry_title">Nouveau mot de passe</string>
  <string name="ftue_auth_reset_password_breaker_title">Vérifiez vos courriels.</string>
- <string name="ftue_auth_reset_password_email_subtitle">%s va vous envoyer un lien de vérification</string>
+ <string name="ftue_auth_reset_password_email_subtitle">${app_name} va vous envoyer un lien de vérification</string> <!-- Tchap: Custom string -->
  <string name="ftue_auth_phone_confirmation_entry_title">Code de confirmation</string>
  <string name="ftue_auth_phone_entry_title">Numéro de téléphone</string>
  <string name="ftue_auth_phone_subtitle">%s a besoin de vérifier votre compte</string>

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

@@ -2054,7 +2054,7 @@
  <string name="ftue_auth_phone_confirmation_entry_title">Confirmation code</string>
 
  <!-- Note for translators, %s is the homeserver name, eg matrix.org -->
- <string name="ftue_auth_reset_password_email_subtitle">%s will send you a verification link</string>
+ <string name="ftue_auth_reset_password_email_subtitle">${app_name} will send you a verification link</string> <!-- Tchap: Custom string -->
  <string name="ftue_auth_reset_password_breaker_title">Check your email.</string>
  <string name="ftue_auth_new_password_entry_title">New Password</string>
  <string name="ftue_auth_new_password_title">Choose a new password</string>

library/ui-styles/build.gradle

@@ -54,11 +54,7 @@ android {
  }
 
  kotlinOptions {
-<<<<<<< HEAD
- jvmTarget = "17" // TCHAP Migrate to Java version 17 to support the new version of webrtc library
-=======
  jvmTarget = versions.jvmTarget
->>>>>>> v1.6.20
  }
 
  buildFeatures {

matrix-sdk-android-flow/build.gradle

@@ -28,11 +28,7 @@ android {
  targetCompatibility versions.targetCompat
  }
  kotlinOptions {
-<<<<<<< HEAD
- jvmTarget = "17" // TCHAP Migrate to Java version 17 to support the new version of webrtc library
-=======
  jvmTarget = versions.jvmTarget
->>>>>>> v1.6.20
  }
 
 // publishNonDefault true

matrix-sdk-android/build.gradle

@@ -106,11 +106,7 @@ android {
  }
 
  kotlinOptions {
-<<<<<<< HEAD
- jvmTarget = "17" // TCHAP Migrate to Java version 17 to support the new version of webrtc library
-=======
  jvmTarget = versions.jvmTarget
->>>>>>> v1.6.20
  freeCompilerArgs += [
  // Disabled for now, there are too many errors. Could be handled in another dedicated PR
  // '-Xexplicit-api=strict', // or warning

matrix-sdk-android/src/androidTest/java/org/matrix/android/sdk/internal/database/RealmSessionStoreMigration43Test.kt

@@ -57,13 +57,8 @@ class RealmSessionStoreMigration43Test {
 
  // TCHAP Use custom realm database
  @Test
-<<<<<<< HEAD
  fun migrationShouldBeNeeed() {
  val realmName = "tchap_session_41.realm"
-=======
- fun migrationShouldBeNeeded() {
- val realmName = "session_42.realm"
->>>>>>> v1.6.20
  val realmConfiguration = configurationFactory.createConfiguration(
  realmName,
  "2948ff8106ad80ca8aeba7ef59775075258d8805f9f6eb306add6c3097154bf5c99bbc965931a29e4512f0b3981d3a562c4c86b860846bac2312e1ab61026762",

vector-app/build.gradle

@@ -37,11 +37,7 @@ ext.versionMinor = 13
 // 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 = 20
->>>>>>> v1.6.20
+ext.versionPatch = 1
 
 static def getGitTimestamp() {
  def cmd = 'git show -s --format=%ct'
@@ -410,11 +406,7 @@ android {
  }
 
  kotlinOptions {
-<<<<<<< HEAD
- jvmTarget = "17" // TCHAP Migrate to Java version 17 to support the new version of webrtc library
-=======
  jvmTarget = versions.jvmTarget
->>>>>>> v1.6.20
  freeCompilerArgs += [
  "-opt-in=kotlin.RequiresOptIn",
  // Fixes false positive "This is an internal Mavericks API. It is not intended for external use."

vector-app/src/androidTest/java/im/vector/app/CantVerifyTest.kt

@@ -26,11 +26,7 @@ import androidx.test.filters.LargeTest
 import com.adevinta.android.barista.internal.viewaction.SleepViewAction
 import im.vector.app.features.MainActivity
 import im.vector.app.ui.robot.ElementRobot
-<<<<<<< HEAD
-import org.junit.Ignore
-=======
 import im.vector.lib.strings.CommonStrings
->>>>>>> v1.6.20
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.RuleChain
@@ -50,7 +46,6 @@ class CantVerifyTest {
  var userName: String = "loginTest_${UUID.randomUUID()}"
 
  @Test
- @Ignore("Tchap: Secure Backup is disabled, so this test cannot succeed")
  fun checkCantVerifyPopup() {
  // Let' create an account
  // This first session will create cross signing keys then logout

vector-app/src/main/java/im/vector/app/core/di/SingletonModule.kt

@@ -30,7 +30,6 @@ import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import im.vector.app.EmojiCompatWrapper
 import im.vector.app.EmojiSpanify
-import im.vector.app.R
 import im.vector.app.SpaceStateHandler
 import im.vector.app.SpaceStateHandlerImpl
 import im.vector.app.config.Config
@@ -65,7 +64,6 @@ import im.vector.app.features.settings.VectorPreferences
 import im.vector.app.features.ui.SharedPreferencesUiStateRepository
 import im.vector.app.features.ui.UiStateRepository
 import im.vector.application.BuildConfig
-import im.vector.application.R
 import im.vector.lib.core.utils.timer.Clock
 import im.vector.lib.core.utils.timer.DefaultClock
 import kotlinx.coroutines.CoroutineScope
@@ -167,7 +165,7 @@ import javax.inject.Singleton
  cryptoAnalyticsPlugin = vectorPlugins.cryptoMetricPlugin,
  customEventTypesProvider = vectorCustomEventTypesProvider,
  // TCHAP Use custom permalink prefix
- clientPermalinkBaseUrl = mdmService.getData(MdmData.PermalinkBaseUrl) ?: context.getString(R.string.permalink_prefix),
+ clientPermalinkBaseUrl = mdmService.getData(MdmData.PermalinkBaseUrl) ?: context.getString(im.vector.app.config.R.string.permalink_prefix),
  syncConfig = SyncConfig(
  syncFilterParams = SyncFilterParams(lazyLoadMembersForStateEvents = true, useThreadNotifications = true)
  )
@@ -232,7 +230,7 @@ import javax.inject.Singleton
  fun providesBuildMeta(context: Context) = BuildMeta(
  isDebug = BuildConfig.DEBUG,
  applicationId = BuildConfig.APPLICATION_ID,
- applicationName = context.getString(R.string.app_name),
+ applicationName = context.getString(im.vector.application.R.string.app_name),
  lowPrivacyLoggingEnabled = Config.LOW_PRIVACY_LOG_ENABLE,
  versionName = BuildConfig.VERSION_NAME,
  gitRevision = BuildConfig.GIT_REVISION,

vector-config/build.gradle

@@ -32,10 +32,6 @@ android {
  }
 
  kotlinOptions {
-<<<<<<< HEAD
- jvmTarget = "17" // TCHAP Migrate to Java version 17 to support the new version of webrtc library
-=======
  jvmTarget = versions.jvmTarget
->>>>>>> v1.6.20
  }
 }

vector/build.gradle

@@ -108,11 +108,7 @@ android {
  }
 
  kotlinOptions {
-<<<<<<< HEAD
- jvmTarget = "17" // TCHAP Migrate to Java version 17 to support the new version of webrtc library
-=======
  jvmTarget = versions.jvmTarget
->>>>>>> v1.6.20
  freeCompilerArgs += [
  "-opt-in=kotlin.RequiresOptIn",
  // Fixes false positive "This is an internal Mavericks API. It is not intended for external use."