From fe5ee20ccc59690ea2b438e494ce71fc3d2cd6a1 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste CHARRON Date: Thu, 25 May 2023 20:42:58 +0200 Subject: [PATCH 1/2] Move network_config --- .github/workflows/main.yml | 3 --- .github/workflows/release.yml | 3 --- {app/src/main/res/xml => doc}/network_security_config.xml | 0 3 files changed, 6 deletions(-) rename {app/src/main/res/xml => doc}/network_security_config.xml (100%) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 669ca491..59ac8f74 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -19,9 +19,6 @@ jobs: steps: - name: Checkout the code uses: actions/checkout@v3 - - name: Remove network security config - run: | - rm ./app/src/main/res/xml/network_security_config.xml - name: Setup Java JDK uses: actions/setup-java@v1 with: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 040745e2..da1d1503 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -22,9 +22,6 @@ jobs: steps: - name: Checkout the code uses: actions/checkout@v3 - - name: Remove network security config - run: | - rm ./app/src/main/res/xml/network_security_config.xml - name: Setup Java JDK uses: actions/setup-java@v1 with: diff --git a/app/src/main/res/xml/network_security_config.xml b/doc/network_security_config.xml similarity index 100% rename from app/src/main/res/xml/network_security_config.xml rename to doc/network_security_config.xml From fc088677147b1f5a17e299bb9c4d4a412b593946 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste CHARRON Date: Thu, 25 May 2023 20:43:36 +0200 Subject: [PATCH 2/2] Bump version --- README.md | 14 +++++++++++--- app/build.gradle | 4 ++-- fastlane/metadata/android/en-US/changelogs/15.txt | 5 +++++ fastlane/metadata/android/fr-FR/changelogs/15.txt | 5 +++++ 4 files changed, 23 insertions(+), 5 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/15.txt create mode 100644 fastlane/metadata/android/fr-FR/changelogs/15.txt diff --git a/README.md b/README.md index 47f0fe55..23cc7ed6 100644 --- a/README.md +++ b/README.md @@ -46,8 +46,7 @@ It helps you to take your privacy back! If you want to help us improve this application, you can: - [Translate app](https://github.com/Exodus-Privacy/exodus-android-app#translation) -- Use [the issues](https://github.com/Exodus-Privacy/exodus-android-app/issues) to report bugs -- Open [discussions](https://github.com/Exodus-Privacy/exodus-android-app/discussions) to propose ideas or feature requests +- Use [the issues](https://github.com/Exodus-Privacy/exodus-android-app/issues) to report bugs and propose ideas or feature requests - Join us on our [IRC channel #exodus-android-app on Libera.chat](https://web.libera.chat/?nick=webguest?#exodus-android-app) (also bridged on [Matrix channel #exodus-android-app:matrix.org](https://matrix.to/#/#exodus-android-app:matrix.org)) @@ -57,7 +56,7 @@ Do you want to help translate the application? Contribute here: https://crowdin.com/project/exodus-android-app -- Exodus is fully translated into 2 languages and 35 languages can be translated in Crowdin. +- Exodus is fully translated into 2 languages and 36 languages can be translated in Crowdin. - You can translate app on Github but remember to insert a backslash `\` before any apostrophe `'`. ### Development @@ -85,6 +84,15 @@ https://crowdin.com/project/exodus-android-app ./gradlew test ``` +**Execute instrumented tests** + +``` +./gradlew connectedAndroidTest +``` + +- To execute test move [network_security_config.xml](/doc/network_security_config.xml) in [/app/src/main/res/xml](/app/src/main/res/xml) +- Add ```android:networkSecurityConfig="@xml/network_security_config"``` in [AndroidManifest.xml](/app/src/main/AndroidManifest.xml) + ### Links - [Privacy-Policy](https://exodus-privacy.eu.org/en/page/privacy-policy/) diff --git a/app/build.gradle b/app/build.gradle index fe8a98c4..ae1521be 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -14,8 +14,8 @@ android { defaultConfig { minSdk 21 targetSdk 33 - versionCode 14 - versionName "3.0.1" + versionCode 15 + versionName "3.1.0" testInstrumentationRunner 'org.eu.exodus_privacy.exodusprivacy.ExodusTestRunner' buildConfigField "String", "EXODUS_API_KEY", "\"$System.env.EXODUS_API_KEY\"" javaCompileOptions { diff --git a/fastlane/metadata/android/en-US/changelogs/15.txt b/fastlane/metadata/android/en-US/changelogs/15.txt new file mode 100644 index 00000000..3ac4eab2 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/15.txt @@ -0,0 +1,5 @@ +- Fix crashs and bugs +- Bump dependencies +- Add support to Android 13 +- Add themed icon for Android 13 +- Add button to refresh reports diff --git a/fastlane/metadata/android/fr-FR/changelogs/15.txt b/fastlane/metadata/android/fr-FR/changelogs/15.txt new file mode 100644 index 00000000..d6c9d517 --- /dev/null +++ b/fastlane/metadata/android/fr-FR/changelogs/15.txt @@ -0,0 +1,5 @@ +- Corrections des plantages et bogues +- Mise à jour des dépendances +- Ajout du support d'Android 13 +- Ajout de l'icône adaptative sur Android 13 +- Ajout d'un button pour actualiser les rapports