From 5f303ec9b417e5e07a97c3790976f1e633c508eb Mon Sep 17 00:00:00 2001 From: linsui Date: Thu, 16 Jun 2022 21:04:01 +0800 Subject: [PATCH] Session F-Droid: fix 1.13.4-1 --- metadata/network.loki.messenger.fdroid.yml | 44 ++++++++++++++++++++-- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/metadata/network.loki.messenger.fdroid.yml b/metadata/network.loki.messenger.fdroid.yml index 41de1a4981..1153f8314c 100644 --- a/metadata/network.loki.messenger.fdroid.yml +++ b/metadata/network.loki.messenger.fdroid.yml @@ -57,6 +57,7 @@ Repo: https://github.com/oxen-io/session-android.git Builds: - versionName: 1.13.1 versionCode: 2795 + disable: crashes commit: e1a033d0eef0d7f1203316a26350fdc17e647268 subdir: app gradle: @@ -88,6 +89,7 @@ Builds: - versionName: 1.13.4 versionCode: 2835 + disable: crashes commit: 4cfe87105888cf4adc05b63256f16dc2cd9c15ba subdir: app gradle: @@ -117,9 +119,45 @@ Builds: -e '/IOUtils/d' linkpreview/LinkPreviewRepository.java ndk: r23b -AutoUpdateMode: Version + - versionName: 1.13.4-1 + versionCode: 2836 + commit: 4cfe87105888cf4adc05b63256f16dc2cd9c15ba + subdir: app + gradle: + - play + rm: + - app/src/main/java/org/thoughtcrime/securesms/notifications/FcmUtils.kt + - app/src/main/java/org/thoughtcrime/securesms/notifications/LokiPushNotificationManager.kt + - app/src/main/java/org/thoughtcrime/securesms/notifications/PushNotificationService.kt + prebuild: + - sed -i -e '/gms/d' -e 's/raw.github.com.*"/jitpack.io"/' ../build.gradle + - sed -i -e '/gms/d' -e '/firebase-messaging/,/^ }/d' -e '/enable true/d' + -e '/circular-progress-button/s/1.1.3-S2/1.1.3/' -e '/android-database-sqlcipher/s/org.signal/net.zetetic/' + -e '/android-database-sqlcipher/s/3.5.9-S3/4.0.0/' -e '/defaultConfig/a applicationId + "network.loki.messenger.fdroid"' -e '/versionCodeOverride/s/$/ + 1/' -e 's/1.13.4/1.13.4-1/' + build.gradle + - sed -i -z -E -e 's/<[^<]+pref_key_use_fcm[^>]+>//' src/main/res/xml/preferences_notifications.xml + - sed -i -E -e '/app_name/s/>(.+)\1 F-Droid