diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2836d218c3..ff47a057ae 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,7 @@ jobs: strategy: fail-fast: false matrix: - target: [ GplayDevTchapRustCryptoWithoutvoipWithoutpinning, FdroidDevTchapRustCryptoWithoutvoipWithoutpinning, GplayBtchapRustCryptoWithvoipWithpinning ] + target: [ GplayDevTchapWithoutvoipWithoutpinning, FdroidDevTchapWithoutvoipWithoutpinning, GplayBtchapWithvoipWithpinning ] # Allow all jobs on develop. Just one per PR. concurrency: group: ${{ github.ref == 'refs/heads/develop' && format('integration-tests-develop-{0}-{1}', matrix.target, github.sha) || format('build-debug-{0}-{1}', matrix.target, github.ref) }} @@ -53,7 +53,7 @@ jobs: strategy: fail-fast: false matrix: - target: [ GplayBtchapRustCryptoWithoutvoipWithpinning, GplayTchapRustCryptoWithoutvoipWithpinning, FdroidBtchapRustCryptoWithoutvoipWithoutpinning, FdroidTchapRustCryptoWithoutvoipWithoutpinning, GplayBtchapRustCryptoWithvoipWithpinning ] + target: [ GplayBtchapWithoutvoipWithpinning, GplayTchapWithoutvoipWithpinning, FdroidBtchapWithoutvoipWithoutpinning, FdroidTchapWithoutvoipWithoutpinning, GplayBtchapWithvoipWithpinning ] concurrency: # Tchap: custom group 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) }} @@ -68,15 +68,9 @@ jobs: uses: gradle/gradle-build-action@v2 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 -======= - - name: Assemble GPlay unsigned apk - run: ./gradlew clean assembleGplayRelease $CI_GRADLE_ARG_PROPERTIES - - name: Upload Gplay unsigned APKs ->>>>>>> v1.6.8 uses: actions/upload-artifact@v3 with: name: ${{ matrix.target }}-release-unsigned @@ -88,8 +82,8 @@ jobs: needs: release env: # Tchap: only generate exodus report for the following target - TARGET_NAME: "GplayTchapRustCryptoWithoutvoipWithpinning" - TARGET_FOLDER: "gplayTchapRustCryptoWithoutvoipWithpinning" + TARGET_NAME: "GplayTchapWithoutvoipWithpinning" + TARGET_FOLDER: "gplayTchapWithoutvoipWithpinning" steps: - name: Obtain apk from artifact id: download @@ -105,11 +99,7 @@ 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 -======= - args: /github/workspace/gplay/release/vector-gplay-universal-release-unsigned.apk -j -o /github/workspace/exodus.json ->>>>>>> v1.6.8 - name: Upload exodus json report uses: actions/upload-artifact@v3 with: diff --git a/.github/workflows/quality.yml b/.github/workflows/quality.yml index 4b8a81a807..39d8682a7f 100644 --- a/.github/workflows/quality.yml +++ b/.github/workflows/quality.yml @@ -55,13 +55,8 @@ jobs: - name: Run lint # Not always, if ktlint or detekt fail, avoid running the long lint check. run: | -<<<<<<< HEAD - ./gradlew vector-app:lintGplayBtchapRustCryptoWithoutvoipWithpinningRelease $CI_GRADLE_ARG_PROPERTIES - ./gradlew vector-app:lintFdroidBtchapRustCryptoWithoutvoipWithoutpinningRelease $CI_GRADLE_ARG_PROPERTIES -======= - ./gradlew vector-app:lintGplayRelease $CI_GRADLE_ARG_PROPERTIES - ./gradlew vector-app:lintFdroidRelease $CI_GRADLE_ARG_PROPERTIES ->>>>>>> v1.6.8 + ./gradlew vector-app:lintGplayBtchapWithoutvoipWithpinningRelease $CI_GRADLE_ARG_PROPERTIES + ./gradlew vector-app:lintFdroidBtchapWithoutvoipWithoutpinningRelease $CI_GRADLE_ARG_PROPERTIES - name: Upload reports if: always() uses: actions/upload-artifact@v3 diff --git a/.github/workflows/sanity_test.yml b/.github/workflows/sanity_test.yml index b27b789210..911ab62b1c 100644 --- a/.github/workflows/sanity_test.yml +++ b/.github/workflows/sanity_test.yml @@ -70,7 +70,7 @@ jobs: touch emulator.log chmod 777 emulator.log adb logcat >> emulator.log & - ./gradlew $CI_GRADLE_ARG_PROPERTIES -PallWarningsAsErrors=false connectedGplayBtchapRustCryptoWithoutvoipWithoutpinningDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=im.vector.app.ui.UiAllScreensSanityTest || adb pull storage/emulated/0/Pictures/failure_screenshots && exit 1 + ./gradlew $CI_GRADLE_ARG_PROPERTIES -PallWarningsAsErrors=false connectedGplayBtchapWithoutvoipWithoutpinningDebugAndroidTest -Pandroid.testInstrumentationRunnerArguments.class=im.vector.app.ui.UiAllScreensSanityTest || adb pull storage/emulated/0/Pictures/failure_screenshots && exit 1 - name: Upload Test Report Log uses: actions/upload-artifact@v2 if: always() diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 7b316fc6b2..e861c6be26 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -61,27 +61,6 @@ jobs: disableRateLimiting: true public_baseurl: "http://10.0.2.2:8080/" -<<<<<<< HEAD - ###- name: Run all the codecoverage tests at once - ### uses: reactivecircus/android-emulator-runner@v2 - ### # continue-on-error: true - ### with: - ### api-level: ${{ matrix.api-level }} - ### arch: x86 - ### profile: Nexus 5X - ### target: playstore - ### force-avd-creation: false - ### emulator-options: -no-snapshot-save -no-window -gpu swiftshader_indirect -noaudio -no-boot-anim -camera-back none - ### disable-animations: true - ### # emulator-build: 7425822 - ### script: | - ### # Tchap : comment this task because CI failed - ### # ./gradlew gatherGplayDebugStringTemplates $CI_GRADLE_ARG_PROPERTIES - ### # ./gradlew unitTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES - ### ./gradlew instrumentationTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES - ### ./gradlew generateCoverageReport $CI_GRADLE_ARG_PROPERTIES - -======= - name: Run all the codecoverage tests at once uses: reactivecircus/android-emulator-runner@v2 # continue-on-error: true @@ -99,7 +78,6 @@ jobs: ./gradlew unitTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES ./gradlew instrumentationTestsWithCoverage $CI_GRADLE_ARG_PROPERTIES ./gradlew generateCoverageReport $CI_GRADLE_ARG_PROPERTIES ->>>>>>> v1.6.8 # NB: continue-on-error marks steps.tests.conclusion = 'success' but leaves steps.tests.outcome = 'failure' ### - name: Run all the codecoverage tests at once (retry if emulator failed) ### uses: reactivecircus/android-emulator-runner@v2 diff --git a/build.gradle b/build.gradle index 548936b907..7cbcba85da 100644 --- a/build.gradle +++ b/build.gradle @@ -310,18 +310,10 @@ tasks.register("recordScreenshots", GradleBuild) { tasks = [':vector:recordPaparazziDebug'] } -<<<<<<< HEAD -// Tchap: remove task not found -//tasks.register("verifyScreenshots", GradleBuild) { -// startParameter.projectProperties.screenshot = "" -// tasks = [':vector:verifyPaparazziDebug'] -//} -======= tasks.register("verifyScreenshots", GradleBuild) { startParameter.projectProperties.screenshot = "" tasks = [':vector:verifyPaparazziDebug'] } ->>>>>>> v1.6.8 ext.initScreenshotTests = { project -> def hasScreenshots = project.hasProperty("screenshot") diff --git a/coverage.gradle b/coverage.gradle index f858dbddce..17da262d94 100644 --- a/coverage.gradle +++ b/coverage.gradle @@ -88,15 +88,5 @@ task unitTestsWithCoverage(type: GradleBuild) { task instrumentationTestsWithCoverage(type: GradleBuild) { startParameter.projectProperties.coverage = "true" startParameter.projectProperties['android.testInstrumentationRunnerArguments.notPackage'] = 'im.vector.app.ui' -<<<<<<< HEAD - tasks = [':vector-app:connectedGplayKotlinCryptoDebugAndroidTest', ':vector:connectedKotlinCryptoDebugAndroidTest'/*, 'matrix-sdk-android:connectedKotlinCryptoDebugAndroidTest'*/] -} - -task instrumentationTestsRustWithCoverage(type: GradleBuild) { - startParameter.projectProperties.coverage = "true" - startParameter.projectProperties['android.testInstrumentationRunnerArguments.notPackage'] = 'im.vector.app.ui' - tasks = [':vector-app:connectedGplayRustCryptoDebugAndroidTest', ':vector:connectedRustCryptoDebugAndroidTest'/*, 'matrix-sdk-android:connectedRustCryptoDebugAndroidTest'*/] -======= - tasks = [':vector-app:connectedGplayDebugAndroidTest', ':vector:connectedDebugAndroidTest', 'matrix-sdk-android:connectedDebugAndroidTest'] ->>>>>>> v1.6.8 + tasks = [':vector-app:connectedGplayDebugAndroidTest', ':vector:connectedDebugAndroidTest'/*, 'matrix-sdk-android:connectedDebugAndroidTest'*/] } diff --git a/vector-app/build.gradle b/vector-app/build.gradle index fa9e1b4814..cea16e80ae 100644 --- a/vector-app/build.gradle +++ b/vector-app/build.gradle @@ -37,7 +37,7 @@ ext.versionMinor = 9 // 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. -ext.versionPatch = 8 +ext.versionPatch = 6 static def getGitTimestamp() { def cmd = 'git show -s --format=%ct' @@ -323,15 +323,11 @@ android { // } // } -<<<<<<< HEAD // The 'store' dimension permits to deal with GooglePlay/Fdroid app // The 'target' dimension permits to specify which platform are used // The 'voip' flavor dimension permits to include/exclude jitsi at compilation time // The 'pinning' flavor dimension permits to enable/disable certificate pinning with fingerprint check - flavorDimensions = ["store", "target", "crypto", "voip", "pinning"] -======= - flavorDimensions = ["store"] ->>>>>>> v1.6.8 + flavorDimensions = ["store", "target", "voip", "pinning"] productFlavors { gplay { @@ -354,26 +350,6 @@ android { buildConfigField "String", "FLAVOR_DESCRIPTION", "\"FDroid\"" } -<<<<<<< HEAD - kotlinCrypto { - dimension "crypto" - // versionName "${versionMajor}.${versionMinor}.${versionPatch}${getFdroidVersionSuffix()}" - buildConfigField "String", "CRYPTO_FLAVOR_DESCRIPTION", "\"olm-crypto\"" -// buildConfigField "String", "FLAVOR_DESCRIPTION", "\"KotlinCrypto\"" - } - - rustCrypto { - dimension "crypto" - isDefault = true - // applicationIdSuffix ".corroded" - // versionNameSuffix "-R" - // resValue "string", "app_name", "ER" - -// // versionName "${versionMajor}.${versionMinor}.${versionPatch}${getFdroidVersionSuffix()}" - buildConfigField "String", "CRYPTO_FLAVOR_DESCRIPTION", "\"rust-crypto\"" -// buildConfigField "String", "FLAVOR_DESCRIPTION", "\"RustCrypto\"" - } - withvoip { dimension "voip" } @@ -416,8 +392,6 @@ android { applicationId "fr.gouv.tchap.a" versionName "${versionMajor}.${versionMinor}.${versionPatch}${getGplayVersionSuffix()}" } -======= ->>>>>>> v1.6.8 } // Tchap: Rename unsigned apk @@ -462,40 +436,40 @@ android { // Tchap: Use custom configuration for Flipper library configurations { - fdroidBtchapRustCryptoWithvoipWithoutpinningDebugImplementation - fdroidDevTchapRustCryptoWithvoipWithoutpinningDebugImplementation - fdroidTchapRustCryptoWithvoipWithoutpinningDebugImplementation + fdroidBtchapWithvoipWithoutpinningDebugImplementation + fdroidDevTchapWithvoipWithoutpinningDebugImplementation + fdroidTchapWithvoipWithoutpinningDebugImplementation - gplayBtchapRustCryptoWithvoipWithoutpinningDebugImplementation - gplayDevTchapRustCryptoWithvoipWithoutpinningDebugImplementation - gplayTchapRustCryptoWithvoipWithoutpinningDebugImplementation + gplayBtchapWithvoipWithoutpinningDebugImplementation + gplayDevTchapWithvoipWithoutpinningDebugImplementation + gplayTchapWithvoipWithoutpinningDebugImplementation - fdroidBtchapRustCryptoWithvoipWithpinningDebugImplementation - fdroidDevTchapRustCryptoWithvoipWithpinningDebugImplementation - fdroidTchapRustCryptoWithvoipWithpinningDebugImplementation + fdroidBtchapWithvoipWithpinningDebugImplementation + fdroidDevTchapWithvoipWithpinningDebugImplementation + fdroidTchapWithvoipWithpinningDebugImplementation - gplayBtchapRustCryptoWithvoipWithpinningDebugImplementation - gplayDevTchapRustCryptoWithvoipWithpinningDebugImplementation - gplayTchapRustCryptoWithvoipWithpinningDebugImplementation + gplayBtchapWithvoipWithpinningDebugImplementation + gplayDevTchapWithvoipWithpinningDebugImplementation + gplayTchapWithvoipWithpinningDebugImplementation - fdroidBtchapRustCryptoWithoutvoipWithpinningDebugImplementation - fdroidDevTchapRustCryptoWithoutvoipWithpinningDebugImplementation - fdroidTchapRustCryptoWithoutvoipWithpinningDebugImplementation + fdroidBtchapWithoutvoipWithpinningDebugImplementation + fdroidDevTchapWithoutvoipWithpinningDebugImplementation + fdroidTchapWithoutvoipWithpinningDebugImplementation - gplayBtchapRustCryptoWithoutvoipWithpinningDebugImplementation - gplayDevTchapRustCryptoWithoutvoipWithpinningDebugImplementation - gplayTchapRustCryptoWithoutvoipWithpinningDebugImplementation + gplayBtchapWithoutvoipWithpinningDebugImplementation + gplayDevTchapWithoutvoipWithpinningDebugImplementation + gplayTchapWithoutvoipWithpinningDebugImplementation - fdroidBtchapRustCryptoWithoutvoipWithoutpinningDebugImplementation - fdroidDevTchapRustCryptoWithoutvoipWithoutpinningDebugImplementation - fdroidTchapRustCryptoWithoutvoipWithoutpinningDebugImplementation + fdroidBtchapWithoutvoipWithoutpinningDebugImplementation + fdroidDevTchapWithoutvoipWithoutpinningDebugImplementation + fdroidTchapWithoutvoipWithoutpinningDebugImplementation - gplayBtchapRustCryptoWithoutvoipWithoutpinningDebugImplementation - gplayDevTchapRustCryptoWithoutvoipWithoutpinningDebugImplementation - gplayTchapRustCryptoWithoutvoipWithoutpinningDebugImplementation + gplayBtchapWithoutvoipWithoutpinningDebugImplementation + gplayDevTchapWithoutvoipWithoutpinningDebugImplementation + gplayTchapWithoutvoipWithoutpinningDebugImplementation } dependencies { @@ -541,82 +515,82 @@ dependencies { // Tchap: We had to exclude fbjni for withVoip, the library is already include in jitsi library // Flipper, debug builds only - gplayBtchapRustCryptoWithvoipWithpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } - gplayBtchapRustCryptoWithvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } + gplayBtchapWithvoipWithpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } + gplayBtchapWithvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } - gplayTchapRustCryptoWithvoipWithpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } - gplayTchapRustCryptoWithvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } + gplayTchapWithvoipWithpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } + gplayTchapWithvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } - gplayDevTchapRustCryptoWithvoipWithpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } - gplayDevTchapRustCryptoWithvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } + gplayDevTchapWithvoipWithpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } + gplayDevTchapWithvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } - fdroidBtchapRustCryptoWithvoipWithpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } - fdroidBtchapRustCryptoWithvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } + fdroidBtchapWithvoipWithpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } + fdroidBtchapWithvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } - fdroidTchapRustCryptoWithvoipWithpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } - fdroidTchapRustCryptoWithvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } + fdroidTchapWithvoipWithpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } + fdroidTchapWithvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } - fdroidDevTchapRustCryptoWithvoipWithpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } - fdroidDevTchapRustCryptoWithvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } + fdroidDevTchapWithvoipWithpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } + fdroidDevTchapWithvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } - gplayBtchapRustCryptoWithvoipWithoutpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } - gplayBtchapRustCryptoWithvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } + gplayBtchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } + gplayBtchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } - gplayDevTchapRustCryptoWithvoipWithoutpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } - gplayDevTchapRustCryptoWithvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } + gplayDevTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } + gplayDevTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } - gplayTchapRustCryptoWithvoipWithoutpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } - gplayTchapRustCryptoWithvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } + gplayTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } + gplayTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } - fdroidBtchapRustCryptoWithvoipWithoutpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } - fdroidBtchapRustCryptoWithvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } + fdroidBtchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } + fdroidBtchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } - fdroidDevTchapRustCryptoWithvoipWithoutpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } - fdroidDevTchapRustCryptoWithvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } + fdroidDevTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } + fdroidDevTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } - fdroidTchapRustCryptoWithvoipWithoutpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } - fdroidTchapRustCryptoWithvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } + fdroidTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipper) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } + fdroidTchapWithvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) { exclude group: 'com.facebook.fbjni', module: 'fbjni' } - gplayBtchapRustCryptoWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipper) - gplayBtchapRustCryptoWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) + gplayBtchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipper) + gplayBtchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) - gplayTchapRustCryptoWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipper) - gplayTchapRustCryptoWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) + gplayTchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipper) + gplayTchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) - gplayDevTchapRustCryptoWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipper) - gplayDevTchapRustCryptoWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) + gplayDevTchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipper) + gplayDevTchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) - fdroidBtchapRustCryptoWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipper) - fdroidBtchapRustCryptoWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) + fdroidBtchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipper) + fdroidBtchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) - fdroidTchapRustCryptoWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipper) - fdroidTchapRustCryptoWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) + fdroidTchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipper) + fdroidTchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) - fdroidDevTchapRustCryptoWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipper) - fdroidDevTchapRustCryptoWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) + fdroidDevTchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipper) + fdroidDevTchapWithoutvoipWithoutpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) - gplayBtchapRustCryptoWithoutvoipWithpinningDebugImplementation(libs.flipper.flipper) - gplayBtchapRustCryptoWithoutvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) + gplayBtchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipper) + gplayBtchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) - gplayTchapRustCryptoWithoutvoipWithpinningDebugImplementation(libs.flipper.flipper) - gplayTchapRustCryptoWithoutvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) + gplayTchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipper) + gplayTchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) - gplayDevTchapRustCryptoWithoutvoipWithpinningDebugImplementation(libs.flipper.flipper) - gplayDevTchapRustCryptoWithoutvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) + gplayDevTchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipper) + gplayDevTchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) - fdroidBtchapRustCryptoWithoutvoipWithpinningDebugImplementation(libs.flipper.flipper) - fdroidBtchapRustCryptoWithoutvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) + fdroidBtchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipper) + fdroidBtchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) - fdroidTchapRustCryptoWithoutvoipWithpinningDebugImplementation(libs.flipper.flipper) - fdroidTchapRustCryptoWithoutvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) + fdroidTchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipper) + fdroidTchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) - fdroidDevTchapRustCryptoWithoutvoipWithpinningDebugImplementation(libs.flipper.flipper) - fdroidDevTchapRustCryptoWithoutvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) + fdroidDevTchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipper) + fdroidDevTchapWithoutvoipWithpinningDebugImplementation(libs.flipper.flipperNetworkPlugin) debugImplementation 'com.facebook.soloader:soloader:0.10.4' debugImplementation "com.kgurgul.flipper:flipper-realm-android:2.2.0" diff --git a/vector/build.gradle b/vector/build.gradle index 594240d365..7a80872199 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -27,8 +27,6 @@ project.android.buildTypes.all { buildType -> initScreenshotTests(project) -apply from: '../flavor.gradle' - android { namespace "im.vector.app" // Due to a bug introduced in Android gradle plugin 3.6.0, we have to specify the ndk version to use @@ -82,7 +80,7 @@ android { // The 'target' dimension permits to specify which platform are used // The 'voip' flavor dimension permits to include/exclude jitsi at compilation time // The 'pinning' flavor dimension permits to enable/disable certificate pinning with fingerprint check - flavorDimensions = ["store", "target", "crypto", "voip", "pinning"] + flavorDimensions = ["store", "target", "voip", "pinning"] productFlavors { gplay { @@ -271,12 +269,9 @@ dependencies { implementation "androidx.emoji2:emoji2:1.3.0" -<<<<<<< HEAD // Tchap: Manage jitsi lib // WebRTC withoutvoipImplementation('org.jitsi:webrtc:111.0.1') -======= ->>>>>>> v1.6.8 // Jitsi withvoipApi('org.jitsi.react:jitsi-meet-sdk:8.1.1') { exclude group: 'com.google.firebase' diff --git a/vector/src/main/java/fr/gouv/tchap/core/dialogs/InviteByEmailDialog.kt b/vector/src/main/java/fr/gouv/tchap/core/dialogs/InviteByEmailDialog.kt index 7a0a32a3a8..52b1ccf78e 100644 --- a/vector/src/main/java/fr/gouv/tchap/core/dialogs/InviteByEmailDialog.kt +++ b/vector/src/main/java/fr/gouv/tchap/core/dialogs/InviteByEmailDialog.kt @@ -22,8 +22,8 @@ import androidx.core.widget.doOnTextChanged import com.google.android.material.dialog.MaterialAlertDialogBuilder import im.vector.app.R import im.vector.app.core.extensions.hideKeyboard -import im.vector.app.core.extensions.isEmail import im.vector.app.databinding.DialogInviteByIdBinding +import org.matrix.android.sdk.api.extensions.isEmail class InviteByEmailDialog( private val activity: Activity diff --git a/vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt b/vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt index 29ff13c6dc..58507fa070 100644 --- a/vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt +++ b/vector/src/main/java/im/vector/app/core/extensions/BasicExtensions.kt @@ -30,14 +30,6 @@ fun Boolean.toOnOff() = if (this) "ON" else "OFF" inline fun T.ooi(block: (T) -> Unit): T = also(block) -<<<<<<< HEAD -/** - * Check if a CharSequence is an email. - */ -fun CharSequence.isEmail() = emailAddress.matcher(this).matches() - -======= ->>>>>>> v1.6.8 fun CharSequence.isMatrixId() = MatrixPatterns.isUserId(this.toString()) /** diff --git a/vector/src/main/java/im/vector/app/features/MainActivity.kt b/vector/src/main/java/im/vector/app/features/MainActivity.kt index 54b9375bc1..5e93e09ad5 100644 --- a/vector/src/main/java/im/vector/app/features/MainActivity.kt +++ b/vector/src/main/java/im/vector/app/features/MainActivity.kt @@ -29,11 +29,7 @@ import com.airbnb.mvrx.viewModel import com.bumptech.glide.Glide import com.google.android.material.dialog.MaterialAlertDialogBuilder import dagger.hilt.android.AndroidEntryPoint -<<<<<<< HEAD import fr.gouv.tchap.features.expired.ExpiredAccountActivity -import im.vector.app.BuildConfig -======= ->>>>>>> v1.6.8 import im.vector.app.R import im.vector.app.core.extensions.startSyncing import im.vector.app.core.extensions.vectorStore diff --git a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt index 80d035bae1..83b552f2f1 100644 --- a/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt +++ b/vector/src/main/java/im/vector/app/features/onboarding/ftueauth/FtueAuthLoginFragment.kt @@ -32,7 +32,6 @@ import dagger.hilt.android.AndroidEntryPoint import im.vector.app.R import im.vector.app.core.extensions.hideKeyboard import im.vector.app.core.extensions.hidePassword -import im.vector.app.core.extensions.isEmail import im.vector.app.core.extensions.toReducedUrl import im.vector.app.databinding.FragmentLoginBinding import im.vector.app.features.login.LoginMode @@ -50,6 +49,7 @@ import kotlinx.coroutines.flow.launchIn import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.onEach import org.matrix.android.sdk.api.auth.SSOAction +import org.matrix.android.sdk.api.extensions.isEmail import org.matrix.android.sdk.api.failure.isInvalidPassword import org.matrix.android.sdk.api.failure.isInvalidUsername import org.matrix.android.sdk.api.failure.isLoginEmailUnknown