From d4048efb52195d8858ef48316dc31a382e572bb1 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Fri, 14 Jun 2024 17:58:53 +0200 Subject: [PATCH] rename fat flavor to foss --- build.gradle | 2 +- scripts/ndk-make.sh | 2 +- scripts/upload-beta.sh | 4 ++-- .../securesms/notifications/FcmReceiveService.java | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename src/{fat => foss}/java/org/thoughtcrime/securesms/notifications/FcmReceiveService.java (100%) diff --git a/build.gradle b/build.gradle index 740613a2f..cd10ebe8a 100644 --- a/build.gradle +++ b/build.gradle @@ -109,7 +109,7 @@ android { } productFlavors { - fat { + foss { dimension "none" buildConfigField "boolean", "USE_PLAY_SERVICES", "false" } diff --git a/scripts/ndk-make.sh b/scripts/ndk-make.sh index bd7820734..a874ad103 100755 --- a/scripts/ndk-make.sh +++ b/scripts/ndk-make.sh @@ -33,7 +33,7 @@ # deploy DeltaChat from the jni/deltachat-core-rust directory by # typing `nmake`: # -# nmake() {(cd ../..; scripts/ndk-make.sh arm64-v8a && ./gradlew installFatDebug; notify-send "install finished")} +# nmake() {(cd ../..; scripts/ndk-make.sh arm64-v8a && ./gradlew installFossDebug; notify-send "install finished")} # # # If anything doesn't work, please open an issue!! diff --git a/scripts/upload-beta.sh b/scripts/upload-beta.sh index 3e95245db..2c094a809 100755 --- a/scripts/upload-beta.sh +++ b/scripts/upload-beta.sh @@ -15,7 +15,7 @@ if [[ ${VERSION:0:1} == "v" ]]; then fi APKGPLAY="gplay/release/deltachat-gplay-release-$VERSION.apk" -APKDEV="build/outputs/apk/fat/debug/deltachat-fat-debug-$VERSION.apk" +APKDEV="build/outputs/apk/foss/debug/deltachat-foss-debug-$VERSION.apk" ls -l $APKGPLAY ls -l $APKDEV read -p "upload these apks to download.delta.chat/android/beta? ENTER to continue, CTRL-C to abort." @@ -28,7 +28,7 @@ echo "upload done." echo "" echo "and now: here is Delta Chat $VERSION - choose your flavour and mind your backups:" echo "- 🍋 https://download.delta.chat/android/beta/deltachat-gplay-release-$VERSION.apk (android, overwrites existing gplay installs, should keep data)" -echo "- 🍉 https://download.delta.chat/android/beta/deltachat-fat-debug-$VERSION.apk (android, can be installed beside gplay)" +echo "- 🍉 https://download.delta.chat/android/beta/deltachat-foss-debug-$VERSION.apk (android, fully FOSS, can be installed beside gplay)" echo "- 🍏 https://testflight.apple.com/join/uEMc1NxS (ios, update to $VERSION may take a day or so)" echo "" echo "what to test: PLEASE_FILL_OUT" diff --git a/src/fat/java/org/thoughtcrime/securesms/notifications/FcmReceiveService.java b/src/foss/java/org/thoughtcrime/securesms/notifications/FcmReceiveService.java similarity index 100% rename from src/fat/java/org/thoughtcrime/securesms/notifications/FcmReceiveService.java rename to src/foss/java/org/thoughtcrime/securesms/notifications/FcmReceiveService.java