fix(e2ei): set user display name correctly for the certificate downloaded file (WPB-8606)

.github/workflows/cherry-pick-rc-to-develop.yml

@@ -92,7 +92,8 @@ jobs:
                   cd ..
                   git add ${{ env.SUBMODULE_NAME }}
                   git commit -m "Update submodule ${{ env.SUBMODULE_NAME }} to latest from ${{ env.TARGET_BRANCH }}"
-                  echo "lastCommitMessage=$LAST_COMMIT_MESSAGE" >> $GITHUB_ENV
+                  # Base64 encode the commit message to avoid issues with newlines and special characters
+                  echo "lastCommitMessageBase64=$(echo "$LAST_COMMIT_MESSAGE" | base64 -w 0 )" >> $GITHUB_ENV
 
             - name: Get Cherry-pick commit
               id: get-cherry
@@ -101,13 +102,23 @@ jobs:
                   if [[ -n "${{ env.SUBMODULE_NAME }}" ]]; then
                     # If SUBMODULE_NAME is set
                     git reset --soft HEAD~2
-                    git commit -m "${{ env.lastCommitMessage }}"
+                    # Decode the base64-encoded string
+                    LAST_COMMIT_MESSAGE=$(echo "${{ env.lastCommitMessageBase64 }}" | base64 --decode)
+                    git commit -m "$LAST_COMMIT_MESSAGE"
                   fi
 
                   # Get the SHA of the current commit (either squashed or not based on the condition above)
                   CHERRY_PICK_COMMIT=$(git rev-parse HEAD)
                   echo "cherryPickCommit=$CHERRY_PICK_COMMIT" >> $GITHUB_ENV
 
+            - name: Get Original Author
+              id: get-author
+              if: env.shouldCherryPick == 'true'
+              run: |
+                  ORIGINAL_AUTHOR=$(git log -1 --pretty=format:'%an <%ae>' ${{ github.event.pull_request.merge_commit_sha }})
+                  echo "Original author: $ORIGINAL_AUTHOR"
+                  echo "originalAuthor=$ORIGINAL_AUTHOR" >> $GITHUB_ENV
+
             - name: Cherry-pick commits
               id: commit-cherry-pick
               if: env.shouldCherryPick == 'true'
@@ -122,7 +133,10 @@ jobs:
                   echo "Captured conflicted files: $CONFLICTED_FILES"
                   if [[ "$OUTPUT" == *"CONFLICT"* ]]; then
                       # Commit the remaining conflicts
-                      git commit -am "Commit with unresolved merge conflicts outside of ${{ env.SUBMODULE_NAME }}"
+                      git add .
+                      git commit --author "${{ env.originalAuthor }}" -am "Commit with unresolved merge conflicts outside of ${{ env.SUBMODULE_NAME }}"
+                  else
+                      git commit --author "${{ env.originalAuthor }}" --amend --no-edit
                   fi
 
                   # Push branch and remove temp

.github/workflows/gradle-run-unit-tests.yml

@@ -64,19 +64,19 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: report
-          path: app/build/reports/jacoco
+          path: app/build/reports/kover
 
       - name: Download Test Reports Folder
         uses: actions/download-artifact@v4
         with:
           name: report
-          path: app/build/reports/jacoco
+          path: app/build/reports/kover
           merge-multiple: true
 
       - name: Upload Test Report
         uses: codecov/codecov-action@v3
         with:
-          files: "app/build/reports/jacoco/jacocoReport/jacocoReport.xml"
+          files: "app/build/reports/kover/report.xml"
 
       - name: Cleanup Gradle Cache
         # Remove some files from the Gradle cache, so they aren't cached by GitHub Actions.

.gitignore

@@ -95,4 +95,9 @@ lint/tmp/
 
 # Autogenerated file with git hash information.
 app/src/main/assets/version.txt
+app/src/main/assets/dependencies_version.json
 /intellij.gdsl
+
+# Editor temporary files
+*~
+\#*#

AR-builder.groovy

@@ -65,7 +65,7 @@ pipeline {
         string(name: 'SOURCE_BRANCH', description: 'Branch or PR name to')
         string(name: 'CHANGE_BRANCH', description: 'Change branch name to build only used to checkout the correct branch if  you need the branch name use SOURCE_BRANCH')
         choice(name: 'BUILD_TYPE', choices: ['Compatrelease', 'Debug', 'Release', 'Compat'], description: 'Build Type for the Client')
-        choice(name: 'FLAVOR', choices: ['Prod', 'Dev', 'Staging', 'Internal', 'Beta'], description: 'Product Flavor to build')
+        choice(name: 'FLAVOR', choices: ['Prod', 'Fdroid', 'Dev', 'Staging', 'Internal', 'Beta'], description: 'Product Flavor to build')
         booleanParam(name: 'UPLOAD_TO_S3', defaultValue: false, description: 'Boolean Flag to define if the build should be uploaded to S3')
         booleanParam(name: 'UPLOAD_TO_PLAYSTORE_ENABLED', defaultValue: false, description: 'Boolean Flag to define if the build should be uploaded to Playstore')
         booleanParam(name: 'RUN_UNIT_TEST', defaultValue: true, description: 'Boolean Flag to define if the unit tests should be run')
@@ -540,7 +540,6 @@ pipeline {
                 }
             }
 
-            sh './gradlew jacocoReport'
             wireSend(secret: env.WIRE_BOT_SECRET, message: "**[#${BUILD_NUMBER} Link](${BUILD_URL})** [${SOURCE_BRANCH}] - ✅ SUCCESS 🎉" + "\nLast 5 commits:\n```text\n$lastCommits\n```")
         }
 

Jenkinsfile

@@ -12,7 +12,7 @@ List<String> defineFlavor() {
     } else if (branchName == "develop") {
         return ['Staging', 'Dev']
     } else if (branchName == "prod") {
-        return ['Prod']
+        return ['Prod', 'Fdroid']
     } else if (branchName == "internal") {
         return ['Internal']
     }

app/build.gradle.kts

@@ -1,3 +1,5 @@
+import scripts.Variants_gradle
+
 /*
  * Wire
  * Copyright (C) 2024 Wire Swiss GmbH
@@ -42,6 +44,11 @@ repositories {
     google()
 }
 
+fun isFossSourceSet(): Boolean {
+    return (Variants_gradle.Default.explicitBuildFlavor() ?: gradle.startParameter.taskRequests.toString())
+        .lowercase()
+        .contains("fdroid")
+}
 android {
     // Most of the configuration is done in the build-logic
     // through the Wire Application convention plugin
@@ -56,8 +63,30 @@ android {
         jniLibs.pickFirsts.add("**/libsodium.so")
     }
     android.buildFeatures.buildConfig = true
+
+    val fdroidBuild = isFossSourceSet()
+
+    sourceSets {
+        // Add the "foss" sourceSets for the fdroid flavor
+        if (fdroidBuild) {
+            getByName("fdroid") {
+                java.srcDirs("src/foss/kotlin", "src/prod/kotlin")
+                res.srcDirs("src/prod/res")
+                println("Building with FOSS sourceSets")
+            }
+            // For all other flavors use the "nonfree" sourceSets
+        } else {
+            getByName("main") {
+                java.srcDirs("src/nonfree/kotlin")
+                println("Building with non-free sourceSets")
+            }
+        }
+    }
 }
 
+
+
+
 dependencies {
     implementation("com.wire.kalium:kalium-logic")
     implementation("com.wire.kalium:kalium-util")
@@ -70,6 +99,7 @@ dependencies {
     implementation(libs.androidx.splashscreen)
     implementation(libs.androidx.exifInterface)
     implementation(libs.androidx.biometric)
+    implementation(libs.androidx.startup)
 
     implementation(libs.ktx.dateTime)
     implementation(libs.material)
@@ -140,10 +170,16 @@ dependencies {
     implementation(libs.bundlizer.core)
 
     // firebase
-    implementation(platform(libs.firebase.bom))
-    implementation(libs.firebase.fcm)
+    var fdroidBuild = isFossSourceSet()
+
+    if (!fdroidBuild) {
+        implementation(platform(libs.firebase.bom))
+        implementation(libs.firebase.fcm)
+        implementation(libs.googleGms.location)
+    } else {
+        println("Excluding FireBase for FDroid build")
+    }
     implementation(libs.androidx.work)
-    implementation(libs.googleGms.location)
 
     // commonMark
     implementation(libs.commonmark.core)