From 00c3db64ac055b7a1583cf8e7cec87cb20925393 Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Tue, 20 Dec 2022 17:28:40 +0800
Subject: [PATCH] misc fixes

---
 metadata/chat.fluffy.fluffychat.yml        |  1 -
 metadata/network.loki.messenger.fdroid.yml | 12 +++---------
 metadata/org.musicpd.yml                   |  4 ++--
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/metadata/chat.fluffy.fluffychat.yml b/metadata/chat.fluffy.fluffychat.yml
index c3e6e0132b..fbef0c29e0 100644
--- a/metadata/chat.fluffy.fluffychat.yml
+++ b/metadata/chat.fluffy.fluffychat.yml
@@ -186,7 +186,6 @@ Builds:
       - export PUB_CACHE=$(pwd)/.pub-cache
       - $$flutter$$/bin/flutter config --no-analytics
       - $$flutter$$/bin/flutter pub get
-      - sed -i -e 's/104.5112.03/104.5112.05/' .pub-cache/hosted/pub.dartlang.org/flutter_webrtc-0.9.14/android/build.gradle
     scandelete:
       - .pub-cache
     build:
diff --git a/metadata/network.loki.messenger.fdroid.yml b/metadata/network.loki.messenger.fdroid.yml
index e895401e11..eeddf1d80d 100644
--- a/metadata/network.loki.messenger.fdroid.yml
+++ b/metadata/network.loki.messenger.fdroid.yml
@@ -472,9 +472,10 @@ Builds:
       - 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
-      - liblazysodium/lazysodium.aar
+      - liblazysodium
     prebuild:
-      - echo -e '\nandroid.jetifier.blacklist=protobuf-lite-3.0.1.jar' >> ../gradle.properties
+      - ln -s $$session-lazysodium-android$$/app ../liblazysodium
+      - ln -s $$session-lazysodium-android$$/session-lazysodium-java ..
       - 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/'
@@ -493,15 +494,8 @@ Builds:
       - sed -i -e '/void registerForFCMIfNeeded/,/^    }/s/^        .*//' -e '/FcmUtils/d'
         -e '/LokiPushNotificationManager/d' ApplicationContext.java
       - sed -i -e '/pref_key_use_fcm/,/^      });/d' preferences/NotificationsPreferenceFragment.java
-      - sed -i -e 's/Strings.isEmptyOrWhitespace(passphrase)/(passphrase?.trim()?.isEmpty()?:true)/'
-        -e '/Strings/d' backup/BackupRestoreActivity.kt
       - sed -i -e 's/IOUtils.readInputStreamFully(bodyStream);/new byte[bodyStream.available()];bodyStream.read(data);/'
         -e '/IOUtils/d' linkpreview/LinkPreviewRepository.java
-    build:
-      - pushd $$session-lazysodium-android$$/app
-      - gradle assembleRelease
-      - popd
-      - mv $$session-lazysodium-android$$/app/build/outputs/aar/*.aar ../liblazysodium/lazysodium.aar
     ndk: r25
 
 AutoUpdateMode: Version
diff --git a/metadata/org.musicpd.yml b/metadata/org.musicpd.yml
index f7739ca662..7d50f1bbdb 100644
--- a/metadata/org.musicpd.yml
+++ b/metadata/org.musicpd.yml
@@ -394,7 +394,6 @@ Builds:
 
   - versionName: 0.23.11
     versionCode: 70
-    disable: arm64 so is 32bit
     commit: 9866adff957f9beefd4a3f3fda26281984e0cb2f
     sudo:
       - apt-get update
@@ -412,8 +411,9 @@ Builds:
       - python3 ../../android/build.py $$SDK$$ $$NDK$$ armeabi-v7a --buildtype=debugoptimized
         -Db_ndebug=true -Dwrap_mode=forcefallback
       - ninja android/apk/mpd-unsigned.apk
+      - rm -rf lib*.* meson-*
       - python3 ../../android/build.py $$SDK$$ $$NDK$$ arm64-v8a --buildtype=debugoptimized
-        -Db_ndebug=true -Dwrap_mode=forcefallback --reconfigure
+        -Db_ndebug=true -Dwrap_mode=forcefallback
       - ninja android/apk/mpd-aligned.apk
     ndk: r25b