From efff6610b7c7a17a77e1a5b2d0b5c5edde086fb0 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 25 Mar 2021 16:50:47 +0000 Subject: [PATCH 01/16] Update actions/upload-artifact action to v2 --- .github/workflows/github_debug_apk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github_debug_apk.yml b/.github/workflows/github_debug_apk.yml index 0e96de80..7dd4c525 100644 --- a/.github/workflows/github_debug_apk.yml +++ b/.github/workflows/github_debug_apk.yml @@ -28,7 +28,7 @@ jobs: # Create artifact - name: Create apk artifact - uses: actions/upload-artifact@v1 + uses: actions/upload-artifact@v2 with: name: app path: app/build/outputs/apk/github/debug/app-github-debug.apk From f0c14deda60e75837a6cb8e713940e54f1cbebfa Mon Sep 17 00:00:00 2001 From: Sitavi <80586127+Sitavi@users.noreply.github.com> Date: Fri, 26 Mar 2021 00:14:54 +0100 Subject: [PATCH 02/16] Create short_description.txt --- fastlane/metadata/android/fr-FR/short_description.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 fastlane/metadata/android/fr-FR/short_description.txt diff --git a/fastlane/metadata/android/fr-FR/short_description.txt b/fastlane/metadata/android/fr-FR/short_description.txt new file mode 100644 index 00000000..ea5cdefc --- /dev/null +++ b/fastlane/metadata/android/fr-FR/short_description.txt @@ -0,0 +1 @@ +Client Instagram simple mais avancé From 24737f41cd8282de8165bd4cffbc5eae9194fead Mon Sep 17 00:00:00 2001 From: Sitavi <80586127+Sitavi@users.noreply.github.com> Date: Fri, 26 Mar 2021 00:44:41 +0100 Subject: [PATCH 03/16] Create full_description.txt --- .../android/fr-FR/full_description.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 fastlane/metadata/android/fr-FR/full_description.txt diff --git a/fastlane/metadata/android/fr-FR/full_description.txt b/fastlane/metadata/android/fr-FR/full_description.txt new file mode 100644 index 00000000..a57001e2 --- /dev/null +++ b/fastlane/metadata/android/fr-FR/full_description.txt @@ -0,0 +1,18 @@ +Si vous ne mettez pas en ligne pas de publications ou de stories sur Instagram, mais que vous ne pouvez pas vous en débarrasser à cause des personnes et des contenus, vous avez maintenant une alternative : Barinsta est un beau client qui vous permet de naviguer et d'interagir avec Instagram, tout en vous offrant plus d'options pour contrôler vos données. + +* Pour ceux qui n'ont pas de compte, vous pouvez accéder aux profils publiques/hashtags/lieux ! +* Pour ceux qui sont connectés, Barinsta peut obtenir la plupart des fonctionnalités de visualisation et d'interaction, avec des fonctionnalités supplémentaires telles que le téléchargement de messages/stories/avatars, la copie de textes, la comparaison des abonnés/abonnements, et plus encore ! +Avantages supplémentaires : + +* Empêche les décisions irrationnelles : Barinsta supprime le double-tap et vous oblige à cliquer dans les publications pour leur donner un like consciencieux. Il vous permet également d'accéder facilement aux publications que vous avez aimées via votre propre profil. +* Permet la personnalisation : choisissez vos thèmes et mises en page ! Vous pouvez même utiliser une disposition en grille pour le feed ! +* Permet de visionner à votre rythme : pas besoin de «tenir» une story ou de scroller sans fin ! Zoomez quand vous le souhaitez ! +* Ce n'est pas un mod : absolument AUCUNE dépendance de l'application Instagram réelle. +* Logiciel libre et open source : avec le code source de l'application ouvert pour inspection, pas besoin de s'inquiéter d'affaires louches ! +* Protège votre vie privée de vos amis : Barinsta vous permet de lire des DM et des stories en privé, sans que vos amis le sachent ! +* Protège votre vie privée d'Instagram : l'application ne demande que ce dont elle a besoin pour vous montrer le contenu et ce que vous avez choisi dans les paramètres. Aucune communication avec des endpoints inutiles et seules des données minimales sont envoyées à Instagram. +*** S'il vous plait, utilisez cette application de manière responsable. *** + +Pour plus d'informations, visiter https://barinsta.austinhuang.me. + +(Nous étions auparavant connus sous le nom d'InstaGrabber.) From 95e08f28ab8e83fad928b52694b2982843c88cc3 Mon Sep 17 00:00:00 2001 From: Sitavi <80586127+Sitavi@users.noreply.github.com> Date: Fri, 26 Mar 2021 00:48:38 +0100 Subject: [PATCH 04/16] Update full_description.txt --- fastlane/metadata/android/fr-FR/full_description.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/metadata/android/fr-FR/full_description.txt b/fastlane/metadata/android/fr-FR/full_description.txt index a57001e2..e7cd9384 100644 --- a/fastlane/metadata/android/fr-FR/full_description.txt +++ b/fastlane/metadata/android/fr-FR/full_description.txt @@ -9,7 +9,7 @@ Avantages supplémentaires : * Permet de visionner à votre rythme : pas besoin de «tenir» une story ou de scroller sans fin ! Zoomez quand vous le souhaitez ! * Ce n'est pas un mod : absolument AUCUNE dépendance de l'application Instagram réelle. * Logiciel libre et open source : avec le code source de l'application ouvert pour inspection, pas besoin de s'inquiéter d'affaires louches ! -* Protège votre vie privée de vos amis : Barinsta vous permet de lire des DM et des stories en privé, sans que vos amis le sachent ! +* Protège votre vie privée de vos amis : Barinsta vous permet de lire des messages et des stories secrètement, sans que vos amis le sachent ! * Protège votre vie privée d'Instagram : l'application ne demande que ce dont elle a besoin pour vous montrer le contenu et ce que vous avez choisi dans les paramètres. Aucune communication avec des endpoints inutiles et seules des données minimales sont envoyées à Instagram. *** S'il vous plait, utilisez cette application de manière responsable. *** From 250f25a7c90cb85ac70290a12c22b337a6555dfe Mon Sep 17 00:00:00 2001 From: Ammar Githam Date: Fri, 26 Mar 2021 21:20:11 +0900 Subject: [PATCH 05/16] Update and rename github_debug_apk.yml to github_release_apk.yml --- ...hub_debug_apk.yml => github_release_apk.yml} | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) rename .github/workflows/{github_debug_apk.yml => github_release_apk.yml} (51%) diff --git a/.github/workflows/github_debug_apk.yml b/.github/workflows/github_release_apk.yml similarity index 51% rename from .github/workflows/github_debug_apk.yml rename to .github/workflows/github_release_apk.yml index 7dd4c525..c83bcccd 100644 --- a/.github/workflows/github_debug_apk.yml +++ b/.github/workflows/github_release_apk.yml @@ -24,11 +24,22 @@ jobs: run: chmod +x gradlew - name: Build Github debug apk - run: ./gradlew assembleGithubDebug --stacktrace + run: ./gradlew assembleGithubRelease --stacktrace + + - name: Sign APK + uses: r0adkll/sign-android-release@v1 + # ID used to access action output + id: sign_app + with: + releaseDirectory: app/github/release + signingKeyBase64: ${{ secrets.SIGNING_KEY }} + alias: ${{ secrets.ALIAS }} + keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} + keyPassword: ${{ secrets.KEY_PASSWORD }} # Create artifact - name: Create apk artifact uses: actions/upload-artifact@v2 with: - name: app - path: app/build/outputs/apk/github/debug/app-github-debug.apk + name: app-github-release.apk + path: ${{steps.sign_app.outputs.signedReleaseFile}} From f9c7e6a0ffd3b3a2913e3cc74e7dcc0552be3b40 Mon Sep 17 00:00:00 2001 From: Ammar Githam Date: Fri, 26 Mar 2021 21:21:23 +0900 Subject: [PATCH 06/16] Update action name --- .github/workflows/github_release_apk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github_release_apk.yml b/.github/workflows/github_release_apk.yml index c83bcccd..0247a134 100644 --- a/.github/workflows/github_release_apk.yml +++ b/.github/workflows/github_release_apk.yml @@ -1,4 +1,4 @@ -name: Github debug build +name: Github release build on: workflow_dispatch # push: From 317bdc39de06a30e01d2cc5a348254f09b26d689 Mon Sep 17 00:00:00 2001 From: Ammar Githam Date: Fri, 26 Mar 2021 21:28:50 +0900 Subject: [PATCH 07/16] Update github_release_apk.yml --- .github/workflows/github_release_apk.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github_release_apk.yml b/.github/workflows/github_release_apk.yml index 0247a134..1b1b53a8 100644 --- a/.github/workflows/github_release_apk.yml +++ b/.github/workflows/github_release_apk.yml @@ -23,7 +23,7 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - - name: Build Github debug apk + - name: Build Github unsigned release apk run: ./gradlew assembleGithubRelease --stacktrace - name: Sign APK @@ -31,7 +31,7 @@ jobs: # ID used to access action output id: sign_app with: - releaseDirectory: app/github/release + releaseDirectory: app/build/outputs/apk/github/release signingKeyBase64: ${{ secrets.SIGNING_KEY }} alias: ${{ secrets.ALIAS }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} From b71984d5d86c55cbf412e8c18933e965ab719b30 Mon Sep 17 00:00:00 2001 From: Ammar Githam Date: Fri, 26 Mar 2021 22:30:55 +0900 Subject: [PATCH 08/16] Custom apk name for github flavor and git ignore android studio flavor release folders. --- .gitignore | 4 +++- app/build.gradle | 12 ++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index d849b086..6b4a96c1 100755 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,6 @@ .externalNativeBuild .cxx app/release -/sentry.properties \ No newline at end of file +/sentry.properties +/app/fdroid/ +/app/github/ diff --git a/app/build.gradle b/app/build.gradle index 1f92ed58..92252e00 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -64,6 +64,18 @@ android { versionNameSuffix "-fdroid" } } + + android.applicationVariants.all { variant -> + if (variant.flavorName != "github") return + variant.outputs.all { output -> + def builtType = variant.buildType.name + def versionName = variant.versionName + // def versionCode = variant.versionCode + // def flavor = variant.flavorName + // flavor is already appended to versionName due to versionNameSuffix + outputFileName = "barinsta_${versionName}_${builtType}.apk" + } + } } configurations.all { From bf38f35539ec1f75dbc69525a035e5855848b08a Mon Sep 17 00:00:00 2001 From: Ammar Githam Date: Fri, 26 Mar 2021 23:07:56 +0900 Subject: [PATCH 09/16] update artifact name --- .github/workflows/github_release_apk.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github_release_apk.yml b/.github/workflows/github_release_apk.yml index 1b1b53a8..6b3d8c8f 100644 --- a/.github/workflows/github_release_apk.yml +++ b/.github/workflows/github_release_apk.yml @@ -37,9 +37,13 @@ jobs: keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} + - name: Get current date and time + id: date + run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M%S')" + # Create artifact - name: Create apk artifact uses: actions/upload-artifact@v2 with: - name: app-github-release.apk + name: barinsta-hotfix-${{ steps.date.outputs.date }} path: ${{steps.sign_app.outputs.signedReleaseFile}} From f3a778db5cedfec6d495aca53c54e6ef0c778d63 Mon Sep 17 00:00:00 2001 From: Ammar Githam Date: Sat, 27 Mar 2021 00:40:08 +0900 Subject: [PATCH 10/16] Update github pre-release versionName --- app/build.gradle | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 92252e00..9960a1c7 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,6 +2,15 @@ apply plugin: 'com.android.application' apply plugin: "androidx.navigation.safeargs" apply from: 'sentry.gradle' +def getGitHash = { -> + def stdout = new ByteArrayOutputStream() + exec { + commandLine 'git', 'rev-parse', '--short', 'HEAD' + standardOutput = stdout + } + return stdout.toString().trim() +} + android { compileSdkVersion 29 @@ -55,7 +64,7 @@ android { productFlavors { github { dimension "repo" - versionNameSuffix "-github" + // versionNameSuffix "-github" // appended in assemble task buildConfigField("String", "dsn", SENTRY_DSN) } @@ -71,9 +80,16 @@ android { def builtType = variant.buildType.name def versionName = variant.versionName // def versionCode = variant.versionCode - // def flavor = variant.flavorName - // flavor is already appended to versionName due to versionNameSuffix - outputFileName = "barinsta_${versionName}_${builtType}.apk" + def flavor = variant.flavorName + + def suffix = "${versionName}-${flavor}_${builtType}" // eg. 19.1.0-github_debug or release + if (builtType.toString() == 'release' && project.hasProperty("pre")) { + // append latest commit short hash for pre-release + suffix = "${versionName}.${getGitHash()}-${flavor}" // eg. 19.1.0.b123456-github + } + + output.versionNameOverride = suffix + outputFileName = "barinsta_${suffix}.apk" } } } @@ -144,6 +160,6 @@ dependencies { debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.6' githubImplementation 'io.sentry:sentry-android:4.3.0' - + testImplementation 'org.junit.jupiter:junit-jupiter:5.7.1' } From 6bc2d38782bf3ea204cc26ab83b7ef43e1efba0b Mon Sep 17 00:00:00 2001 From: Ammar Githam Date: Sat, 27 Mar 2021 00:43:18 +0900 Subject: [PATCH 11/16] Update action to create pre-release builds --- .../{github_release_apk.yml => github_pre_release.yml} | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) rename .github/workflows/{github_release_apk.yml => github_pre_release.yml} (83%) diff --git a/.github/workflows/github_release_apk.yml b/.github/workflows/github_pre_release.yml similarity index 83% rename from .github/workflows/github_release_apk.yml rename to .github/workflows/github_pre_release.yml index 6b3d8c8f..c5323960 100644 --- a/.github/workflows/github_release_apk.yml +++ b/.github/workflows/github_pre_release.yml @@ -1,4 +1,4 @@ -name: Github release build +name: Github pre-release build on: workflow_dispatch # push: @@ -23,8 +23,8 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - - name: Build Github unsigned release apk - run: ./gradlew assembleGithubRelease --stacktrace + - name: Build Github unsigned pre-release apk + run: ./gradlew assembleGithubRelease --stacktrace --project-prop pre - name: Sign APK uses: r0adkll/sign-android-release@v1 @@ -45,5 +45,5 @@ jobs: - name: Create apk artifact uses: actions/upload-artifact@v2 with: - name: barinsta-hotfix-${{ steps.date.outputs.date }} + name: barinsta_pre-release_${{ steps.date.outputs.date }} path: ${{steps.sign_app.outputs.signedReleaseFile}} From a4fb746d14ec29c1feaa7f7818408c9f1be0f6b4 Mon Sep 17 00:00:00 2001 From: Ammar Githam Date: Sat, 27 Mar 2021 02:35:23 +0900 Subject: [PATCH 12/16] pre release action telegram notification --- .github/workflows/github_pre_release.yml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/.github/workflows/github_pre_release.yml b/.github/workflows/github_pre_release.yml index c5323960..cda982ae 100644 --- a/.github/workflows/github_pre_release.yml +++ b/.github/workflows/github_pre_release.yml @@ -47,3 +47,12 @@ jobs: with: name: barinsta_pre-release_${{ steps.date.outputs.date }} path: ${{steps.sign_app.outputs.signedReleaseFile}} + + # Send Telegram notification + - name: Send Telegram notification + uses: appleboy/telegram-action@master + with: + to: ${{ secrets.TELEGRAM_BUILDS_CHANNEL_TO }} + token: ${{ secrets.TELEGRAM_BUILDS_BOT_TOKEN }} + message: Build successful + document: ${{steps.sign_app.outputs.signedReleaseFile}} From f591f1c15ddff783a92f4804ece90e4649e7dfef Mon Sep 17 00:00:00 2001 From: Ammar Githam Date: Sat, 27 Mar 2021 03:14:57 +0900 Subject: [PATCH 13/16] Improve notification message --- .github/workflows/github_pre_release.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/.github/workflows/github_pre_release.yml b/.github/workflows/github_pre_release.yml index cda982ae..33d195ee 100644 --- a/.github/workflows/github_pre_release.yml +++ b/.github/workflows/github_pre_release.yml @@ -48,11 +48,21 @@ jobs: name: barinsta_pre-release_${{ steps.date.outputs.date }} path: ${{steps.sign_app.outputs.signedReleaseFile}} - # Send Telegram notification - - name: Send Telegram notification + # Send success notification + - name: Send success Telegram notification + if: ${{ success() }} uses: appleboy/telegram-action@master with: to: ${{ secrets.TELEGRAM_BUILDS_CHANNEL_TO }} token: ${{ secrets.TELEGRAM_BUILDS_BOT_TOKEN }} - message: Build successful + message: "${{ github.workflow }} ${{ github.job }} #${{ github.run_number }} completed successfully.\nURL: https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}" document: ${{steps.sign_app.outputs.signedReleaseFile}} + + # Send failure notification + - name: Send failure Telegram notification + if: ${{ failure() }} + uses: appleboy/telegram-action@master + with: + to: ${{ secrets.TELEGRAM_BUILDS_CHANNEL_TO }} + token: ${{ secrets.TELEGRAM_BUILDS_BOT_TOKEN }} + message: "${{ github.workflow }} ${{ github.job }} #${{ github.run_number }} failed.\nURL: https://github.com/${{github.repository}}/actions/runs/${{github.run_id}}" From 058a89b992cc44b1f9a2f2d1dcaa6817fb736229 Mon Sep 17 00:00:00 2001 From: Ammar Githam Date: Sat, 27 Mar 2021 03:21:51 +0900 Subject: [PATCH 14/16] Update workflow name To avoid double 'build' in notification --- .github/workflows/github_pre_release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github_pre_release.yml b/.github/workflows/github_pre_release.yml index 33d195ee..22bf3620 100644 --- a/.github/workflows/github_pre_release.yml +++ b/.github/workflows/github_pre_release.yml @@ -1,4 +1,4 @@ -name: Github pre-release build +name: Github pre-release on: workflow_dispatch # push: From b3a27622d065e5a66a974107cbe4bba756aff76d Mon Sep 17 00:00:00 2001 From: Ammar Githam Date: Sat, 27 Mar 2021 03:35:48 +0900 Subject: [PATCH 15/16] Add nightly release workflow --- .github/workflows/github_nightly_release.yml | 67 ++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 .github/workflows/github_nightly_release.yml diff --git a/.github/workflows/github_nightly_release.yml b/.github/workflows/github_nightly_release.yml new file mode 100644 index 00000000..ba4517a2 --- /dev/null +++ b/.github/workflows/github_nightly_release.yml @@ -0,0 +1,67 @@ +name: Github nightly + +on: + schedule: + # * is a special character in YAML so you have to quote this string + - cron: '27 10 * * *' # Everyday at 10:27:00 + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: set up JDK 1.8 + uses: actions/setup-java@v1 + with: + java-version: 1.8 + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Build Github unsigned apk + run: ./gradlew assembleGithubRelease --stacktrace --project-prop pre + + - name: Sign APK + uses: r0adkll/sign-android-release@v1 + # ID used to access action output + id: sign_app + with: + releaseDirectory: app/build/outputs/apk/github/release + signingKeyBase64: ${{ secrets.SIGNING_KEY }} + alias: ${{ secrets.ALIAS }} + keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} + keyPassword: ${{ secrets.KEY_PASSWORD }} + + - name: Get current date and time + id: date + run: echo "::set-output name=date::$(date +'%Y%m%d_%H%M%S')" + + # Create artifact + - name: Create apk artifact + uses: actions/upload-artifact@v2 + with: + name: barinsta_nightly_${{ steps.date.outputs.date }} + path: ${{steps.sign_app.outputs.signedReleaseFile}} + + # Send success notification + - name: Send success Telegram notification + if: ${{ success() }} + uses: appleboy/telegram-action@master + with: + to: ${{ secrets.TELEGRAM_BUILDS_CHANNEL_TO }} + token: ${{ secrets.TELEGRAM_BUILDS_BOT_TOKEN }} + message: "${{ github.workflow }} ${{ github.job }} #${{ github.run_number }} completed successfully.\nhttps://github.com/${{github.repository}}/actions/runs/${{github.run_id}}" + document: ${{steps.sign_app.outputs.signedReleaseFile}} + + # Send failure notification + - name: Send failure Telegram notification + if: ${{ failure() }} + uses: appleboy/telegram-action@master + with: + to: ${{ secrets.TELEGRAM_BUILDS_CHANNEL_TO }} + token: ${{ secrets.TELEGRAM_BUILDS_BOT_TOKEN }} + message: "${{ github.workflow }} ${{ github.job }} #${{ github.run_number }} failed.\nhttps://github.com/${{github.repository}}/actions/runs/${{github.run_id}}" From 21ad97d9c849f399033e36aef4d31b670511a6b6 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Fri, 26 Mar 2021 19:19:16 +0000 Subject: [PATCH 16/16] Update dependency com.squareup.leakcanary:leakcanary-android to v2.7 --- app/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 9960a1c7..9b39a1a2 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -157,7 +157,7 @@ dependencies { implementation 'com.github.ammargitham:uCrop:2.3-native-beta-2' implementation 'com.github.ammargitham:android-gpuimage:2.1.1-beta4' - debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.6' + debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7' githubImplementation 'io.sentry:sentry-android:4.3.0'