diff --git a/.gitignore b/.gitignore index dd0cf5748c..e7c3ab8df5 100644 --- a/.gitignore +++ b/.gitignore @@ -40,9 +40,6 @@ fastlane/report.xml # Keystore keystore/* -# Private properties -private.properties - # Sentry properties sentry.properties diff --git a/README.md b/README.md index 1c147899a7..f1273c22e5 100644 --- a/README.md +++ b/README.md @@ -40,19 +40,12 @@ Each merge to `main` branch builds the branch's HEAD and deploys it to [Firebase App Distribution](https://firebase.google.com/docs/app-distribution). ## Signing -All `release` builds done on CI are automatically signed with ProtonMail's keystore. In order to perform signing locally, the keystore will need to be placed into the `keystore/` directory and the credentials will be read from `private.properties` file. +All `release` builds done on CI are automatically signed with ProtonMail's keystore. Signing locally is unsupported. ## Observability Crashes and errors that happen in `release` (non debuggable) builds are reported to Sentry in an anonymized form. -The CI sets up the integration with Sentry by providing in the build environment `private.properties` and `sentry.properties` files that contain the secrets needed. -This can as well be performed locally by creating `private.properties` and `sentry.properties` files and filling them with the needed secrets (eg. `SentryDSN`; for more details about the `sentry.properties` file, see https://docs.sentry.io/platforms/android/gradle/#proguardr8--dexguard). - -## Use core libraries from local git submodule -It is possible to run the application getting the "core" libraries from the local git submodule instead of gradle by setting the following flag to true in `gradle.properties` file: - -``` -useCoreGitSubmodule=true -``` +The CI sets up the integration with Sentry by providing in the build environment `sentry.properties` files that contain the secrets needed. +This can as well be performed locally by creating a `sentry.properties` file and filling them with the needed secrets (eg. `SentryDSN`; for more details about the `sentry.properties` file, see https://docs.sentry.io/platforms/android/gradle/#proguardr8--dexguard). ## Code style This project's code style and formatting is checked by detekt. The rule set is [ktlint's default one](https://github.com/pinterest/ktlint) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6d0daa611a..830e9c406b 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -34,19 +34,8 @@ plugins { id("app-config-plugin") } -val privateProperties = Properties().apply { - @Suppress("SwallowedException") - try { - load(rootDir.resolve("private.properties").inputStream()) - } catch (exception: java.io.FileNotFoundException) { - // Provide empty properties to allow the app to be built without secrets - Properties() - } -} - val accountSentryDSN: String = System.getenv("SENTRY_DSN_ACCOUNT") ?: "" val sentryDSN: String = System.getenv("SENTRY_DSN_MAIL") ?: "" -val proxyToken: String? = privateProperties.getProperty("PROXY_TOKEN") val gitHashProvider: Provider = providers.exec { commandLine("git", "rev-parse", "--short=7", "HEAD") @@ -77,7 +66,6 @@ android { buildConfigField("String", "SENTRY_DSN", sentryDSN.toBuildConfigValue()) buildConfigField("String", "ACCOUNT_SENTRY_DSN", accountSentryDSN.toBuildConfigValue()) - buildConfigField("String", "PROXY_TOKEN", proxyToken.toBuildConfigValue()) buildConfigField("String", "RUST_SDK_VERSION", "\"${libs.versions.proton.rust.core.get()}\"") setAssetLinksResValue("proton.me") diff --git a/scripts/uitests/setup-core-assets.sh b/scripts/uitests/setup-core-assets.sh index f9115cfa31..dab1dbd0d0 100755 --- a/scripts/uitests/setup-core-assets.sh +++ b/scripts/uitests/setup-core-assets.sh @@ -22,8 +22,6 @@ set -o errexit PROJECT_ROOT_PATH=$(git rev-parse --show-toplevel) -echo PROXY_TOKEN="$(curl -o - https://proxy.proton.black/token/get)" >> $PROJECT_ROOT_PATH/private.properties - mkdir $PROJECT_ROOT_PATH/app/src/uiTest/assets -p base64 -d - < "$TEST_USERS_CREDENTIALS_FILE" > $PROJECT_ROOT_PATH/app/src/uiTest/assets/users.json base64 -d - < "$INTERNAL_API_FILE" > $PROJECT_ROOT_PATH/app/src/uiTest/assets/internal_api.json