From 94266c2b118d21621c856ddffa7ae02a199e2c1f Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Thu, 27 Oct 2022 18:46:36 +0800
Subject: [PATCH] misc fixes

---
 metadata/com.newsblur.yml                     | 24 +++++++++++++++++++
 .../com.simplemobiletools.smsmessenger.yml    |  6 +----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/metadata/com.newsblur.yml b/metadata/com.newsblur.yml
index 232a753a1d..f1e68a65f6 100644
--- a/metadata/com.newsblur.yml
+++ b/metadata/com.newsblur.yml
@@ -1561,6 +1561,30 @@ Builds:
         util/PrefsUtils.java
       - echo 'package com.newsblur.activity;class Premium:NbActivity() {}' > activity/Premium.kt
 
+  - versionName: 12.1.1
+    versionCode: 207
+    commit: 214dde838e06753747827c299bb44b0e7b75aba1
+    gradle:
+      - yes
+    rm:
+      - clients/android/NewsBlur/buildtools/*.jar
+      - clients/android/NewsBlur/src/com/newsblur/service/SubscriptionSyncService.kt
+      - clients/android/NewsBlur/src/com/newsblur/subscription
+    prebuild:
+      - mv clients/android/NewsBlur ..
+      - rm -r ./*
+      - mv ../NewsBlur/* .
+      - rm -r ../NewsBlur
+      - sed -i -e '/com.google.android.play/d' -e '/billingclient/d' build.gradle
+      - sed -i -z -E -e 's/<service[^>]+SubscriptionSyncService[^>]+\/>//' AndroidManifest.xml
+      - cd src/com/newsblur
+      - sed -i -e '/play.core/d' -e '/void checkInAppReview/,/^    }/d' -e '/checkInAppReview/d'
+        -e '/reviewInfo != null/,/^        }$/c super.onBackPressed();' -e '/Review/d'
+        activity/FeedItemsList.java
+      - sed -i -e '/SubscriptionSyncService/d' activity/InitActivity.kt activity/LoginProgress.kt
+        util/PrefsUtils.java
+      - echo 'package com.newsblur.activity;class Premium:NbActivity() {}' > activity/Premium.kt
+
 AutoUpdateMode: None
 UpdateCheckMode: RepoManifest
 CurrentVersion: 12.1.1
diff --git a/metadata/com.simplemobiletools.smsmessenger.yml b/metadata/com.simplemobiletools.smsmessenger.yml
index d9e9e35389..8058303036 100644
--- a/metadata/com.simplemobiletools.smsmessenger.yml
+++ b/metadata/com.simplemobiletools.smsmessenger.yml
@@ -433,15 +433,11 @@ Builds:
     versionCode: 62
     commit: e224bbc698a476b9ee42669bdc97aa10c5555079
     subdir: app
-    sudo:
-      - apt-get update
-      - apt-get install -y openjdk-11-jdk-headless
-      - update-alternatives --auto java
     gradle:
       - fdroid
     prebuild: sed -i -e '/keystore.*{/,/}/d; /keystore/d' build.gradle
 
-AutoUpdateMode: Version %v
+AutoUpdateMode: Version
 UpdateCheckMode: Tags
 CurrentVersion: 5.16.1
 CurrentVersionCode: 62