refactor: Use mobilestack references in android builds #6039

jophish · 2024-09-18T21:11:26Z

Description

Makes the Android builds more brand agnostic. Replaces the existing keystore android keystore containing the upload key by:

Renaming the private key alias within the keystore from celo-release-key to mobilestack-release-key
Using the same password for both the store as well as the private key within

Test plan

Related issues

Fixes #[issue number here]

Backwards compatibility

Network scalability

If a new NetworkId and/or Network are added in the future, the changes in this PR will:

Continue to work without code changes, OR trigger a compilation error (guaranteeing we find it when a new network is added)

jophish · 2024-09-18T21:11:45Z

.github/workflows/release-fastlane-android.yml

@@ -39,8 +39,8 @@ jobs:
        with:
          secrets: |-
            ANDROID_RELEASE_KEYSTORE:projects/1027349420744/secrets/ANDROID_RELEASE_KEYSTORE
-            CELO_RELEASE_KEY_PASSWORD:projects/1027349420744/secrets/CELO_RELEASE_KEY_PASSWORD
-            CELO_RELEASE_STORE_PASSWORD:projects/1027349420744/secrets/CELO_RELEASE_STORE_PASSWORD
+            MOBILESTACK_RELEASE_KEY_PASSWORD:projects/1027349420744/secrets/MOBILESTACK_RELEASE_KEY_PASSWORD


I've ported over these secrets in GCP

codecov · 2024-09-18T21:20:23Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 88.92%. Comparing base (f788797) to head (ef89804).
Report is 1 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #6039      +/-   ##
==========================================
- Coverage   88.93%   88.92%   -0.01%     
==========================================
  Files         737      737              
  Lines       31371    31371              
  Branches     5800     5800              
==========================================
- Hits        27899    27898       -1     
- Misses       3274     3429     +155     
+ Partials      198       44     -154

see 66 files with indirect coverage changes

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update f788797...ef89804. Read the comment docs.

jophish · 2024-09-18T21:38:12Z

.github/workflows/e2e-android.yml

@@ -50,6 +50,9 @@ jobs:
          yes | sdkmanager "platform-tools" "platforms;android-${{ inputs.android-api-level }}"
          set -o pipefail

+          # Install Ninja


See here; not sure why this is now needed, though I have to imagine it's related to the rest of the changes in this PR

jophish · 2024-09-19T01:00:08Z

This seems to fail on the nightly release that I tested due to the build looking for celo-release-key.keystore, despite having removed all apparent references of it from the repo... not sure why this is happening.

…allet into jophish/android-mobilestack

kathaypacific

LGTM!!

android/app/src/main/res/values/strings.xml

Oh wait, I just saw your comment about the release not working with these changes 🙈

jophish · 2024-09-26T21:31:56Z

The nightly release test passed! https://valora-app.slack.com/archives/C02D08P412Q/p1727385960907899

kathaypacific

🚀 LGTM! remember to populate the PR description before merging :D

jeanregisser

Great!

.github/workflows/release-fastlane-android.yml

jeanregisser · 2024-09-27T10:14:44Z

android/gradle.properties

+# Note that the key alias lacks Mobile Stack naming, since updating this would
+# require regenerating the keystore.
+MOBILESTACK_RELEASE_STORE_FILE=mobilestack-release-key.keystore
+MOBILESTACK_RELEASE_KEY_ALIAS=celo-key-alias


I think we can update the keystore. Also an opportunity to use the same password for the store and the key inside.

@jeanregisser What's the typical process for this? I assume we want to re-use our existing upload key; I can't seem to find an option in Android Studio (which is what I've used in the past for creating brand new upload keys/keystores) to create a new keystore from an existing key.

Hey, this can be done using the keytool cli:

Renaming the alias: https://stackoverflow.com/a/5707518/158525

Changing the passwords: https://stackoverflow.com/a/56382758/158525

WALLET.md

.github/workflows/release-fastlane-android.yml

android/app/build.gradle

android/app/src/androidTest/java/xyz/mobilestack/mobile/DetoxTest.java

jophish · 2024-10-31T21:12:58Z

The android release has been successfully tested here using a newly generated keystore with a different alias for the upload key as well as identical passwords for the store and private key.

satish-ravi · 2024-10-31T23:19:54Z

android/.project

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 	<name>celo</name>


not sure how much this name matters, but should we have the name here and in app/.project consistent?

satish-ravi · 2024-10-31T23:26:15Z

android/app/src/main/res/values/strings.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  <string name="persona_inquiry_start_title">Valora would like to verify your identity</string>
+  <string name="persona_inquiry_start_title">This app would like to verify your identity</string>


wonder if this can somehow use app name. I guess its a barely used feature so maybe not too important

### Description Makes the Android builds more brand agnostic. Replaces the existing keystore android keystore containing the upload key by: * Renaming the private key alias within the keystore from `celo-release-key` to `mobilestack-release-key` * Using the same password for both the store as well as the private key within ### Test plan  ### Related issues - Fixes #[issue number here] ### Backwards compatibility  ### Network scalability If a new NetworkId and/or Network are added in the future, the changes in this PR will: - [ ] Continue to work without code changes, OR trigger a compilation error (guaranteeing we find it when a new network is added)

Genericize Android builds

01881d0

jophish commented Sep 18, 2024

View reviewed changes

test nightly

19f4082

jophish commented Sep 18, 2024

View reviewed changes

jophish and others added 2 commits September 18, 2024 19:59

Fix e2e

e3bfade

Merge branch 'main' into jophish/android-mobilestack

8466931

jophish and others added 3 commits September 18, 2024 21:00

Revert tests

f02c318

Merge branch 'jophish/android-mobilestack' of github.com:valora-inc/w…

8caecf5

…allet into jophish/android-mobilestack

Merge branch 'main' into jophish/android-mobilestack

dba285e

jophish changed the title ~~refactor: Use mobilestack reference in android builds~~ refactor: Use mobilestack references in android builds Sep 19, 2024

kathaypacific previously approved these changes Sep 19, 2024

View reviewed changes

android/app/src/main/res/values/strings.xml Outdated Show resolved Hide resolved

jophish and others added 8 commits September 19, 2024 22:55

Merge branch 'main' into jophish/android-mobilestack

222b49b

Merge branch 'main' into jophish/android-mobilestack

9d68634

Merge branch 'main' into jophish/android-mobilestack

1f1cbc6

Test release

691f6cc

Strings

cf89d13

Update keys

781aebf

Update alias name

332e419

Revert test

75a8bfe

kathaypacific approved these changes Sep 27, 2024

View reviewed changes

jeanregisser reviewed Sep 27, 2024

View reviewed changes

jophish and others added 5 commits September 30, 2024 18:03

Respond to comments

612c97b

Merge branch 'main' into jophish/android-mobilestack

d09bacb

Use new keystore with single password

dc0e297

Change alias

49582ba

Test alfajores nightly

ab3c9aa

Merge branch 'main' into jophish/android-mobilestack

713f597

jophish added 2 commits October 31, 2024 17:13

Revert test

76323ce

Merge

de27a5a

satish-ravi approved these changes Oct 31, 2024

View reviewed changes

jophish and others added 2 commits November 4, 2024 08:54

Change project name

6eef6b4

Merge branch 'main' into jophish/android-mobilestack

ef89804

jophish added this pull request to the merge queue Nov 4, 2024

Merged via the queue into main with commit 7e74af3 Nov 4, 2024
16 checks passed

jophish deleted the jophish/android-mobilestack branch November 4, 2024 14:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

refactor: Use mobilestack references in android builds #6039

refactor: Use mobilestack references in android builds #6039

jophish commented Sep 18, 2024 •

edited

Loading

jophish Sep 18, 2024

codecov bot commented Sep 18, 2024 •

edited

Loading

jophish Sep 18, 2024

jophish commented Sep 19, 2024

kathaypacific left a comment

jophish commented Sep 26, 2024

kathaypacific left a comment

jeanregisser left a comment

jeanregisser Sep 27, 2024

jophish Sep 30, 2024

jeanregisser Oct 1, 2024

jophish commented Oct 31, 2024

satish-ravi Oct 31, 2024

satish-ravi Oct 31, 2024

refactor: Use mobilestack references in android builds #6039

refactor: Use mobilestack references in android builds #6039

Conversation

jophish commented Sep 18, 2024 • edited Loading

Description

Test plan

Related issues

Backwards compatibility

Network scalability

jophish Sep 18, 2024

Choose a reason for hiding this comment

codecov bot commented Sep 18, 2024 • edited Loading

Codecov Report

jophish Sep 18, 2024

Choose a reason for hiding this comment

jophish commented Sep 19, 2024

kathaypacific left a comment

Choose a reason for hiding this comment

jophish commented Sep 26, 2024

kathaypacific left a comment

Choose a reason for hiding this comment

jeanregisser left a comment

Choose a reason for hiding this comment

jeanregisser Sep 27, 2024

Choose a reason for hiding this comment

jophish Sep 30, 2024

Choose a reason for hiding this comment

jeanregisser Oct 1, 2024

Choose a reason for hiding this comment

jophish commented Oct 31, 2024

satish-ravi Oct 31, 2024

Choose a reason for hiding this comment

satish-ravi Oct 31, 2024

Choose a reason for hiding this comment

jophish commented Sep 18, 2024 •

edited

Loading

codecov bot commented Sep 18, 2024 •

edited

Loading