Merge pull request #673 from swakwork/fix/v21

Some fixes for v21

Author: crimera

extensions/twitter/src/main/java/app/revanced/extension/twitter/patches/DatabasePatch.java

@@ -71,55 +71,64 @@ private static StringBuilder removeFromDB(boolean[] checkedItems){
             database = SQLiteDatabase.openDatabase(DATABASE_PATH, null, SQLiteDatabase.OPEN_READWRITE);
             if (database != null && database.isOpen()) {
                 for (int i = 0; i < checkedItems.length; i++) {
+                    List<String> keywords = new ArrayList<String>();
                     if (checkedItems[i]) {
-                        String entry_id_str = "";
-                        String entry_id_str2 = "";
                         switch (i) {
                             case 0: {
-                                entry_id_str = "promoted%";
-                                entry_id_str2 = "rtb%";
+                                keywords.add("promoted%");
+                                keywords.add("rtb%");
+                                keywords.add("%promoted%");
                                 break;
                             }
                             case 1: {
-                                entry_id_str = "who-to-follow%";
+                                keywords.add("who-to-follow%");
                                 break;
                             }
                             case 2: {
-                                entry_id_str = "who-to-subscribe%";
+                                keywords.add("who-to-follow%");
+                            //    entry_id_str = "who-to-subscribe%";
                                 break;
                             }
                             case 3: {
-                                entry_id_str = "community-to-join%";
+                                keywords.add("community-to-join%");
+                               // entry_id_str = "community-to-join%";
                                 break;
                             }
                             case 4: {
-                                entry_id_str = "bookmarked%";
+                                keywords.add("bookmarked%");
+                                //entry_id_str = "bookmarked%";
                                 break;
                             }
                             case 5: {
-                                entry_id_str = "pinned-tweets%";
+                                keywords.add("tweets%");
+                                //entry_id_str = "pinned-tweets%";
                                 break;
                             }
                             case 6: {
-                                entry_id_str = "tweetdetailrelatedtweets%";
+                                keywords.add("tweetdetailrelatedtweets%");
+                                //entry_id_str = "tweetdetailrelatedtweets%";
                                 break;
                             }
                             case 7: {
-                                entry_id_str = "messageprompt%";
+                                keywords.add("messageprompt%");
+                                //entry_id_str = "messageprompt%";
                                 break;
                             }
                             case 8: {
-                                entry_id_str = "stories%";
+                                keywords.add("stories%");
+                                //entry_id_str = "stories%";
                                 break;
                             }
                         }
-                        int deletedRows = 0;
-                        if (entry_id_str != "") {
-                            deletedRows = database.delete("timeline", "entity_id LIKE ?", new String[]{entry_id_str});                        }
-                        if (entry_id_str2 != "") {
-                            int deletedRows2 = database.delete("timeline", "entity_id LIKE ?", new String[]{entry_id_str2});
-                            deletedRows+=deletedRows2;
+
+                        StringBuilder selection = new StringBuilder();
+                        String[] selectionArgs = new String[keywords.size()];
+                        for (int ind = 0; ind < keywords.size(); ind++) {
+                            if (ind > 0) selection.append(" OR ");
+                            selection.append("entity_id LIKE ?");
+                            selectionArgs[ind] = "%" + keywords.get(ind) + "%";
                         }
+                        int deletedRows = database.delete("timeline", selection.toString(), selectionArgs);
                         result.append("• "+listItems[i]+" = "+String.valueOf(deletedRows)+"\n");
                     }
                 }

extensions/twitter/src/main/java/app/revanced/extension/twitter/patches/FeatureSwitchPatch.java

@@ -24,7 +24,6 @@ private static void chirpFont() {
     }
 
     private static void hideGoogleAds() { addFlag("ssp_ads_dsp_client_context_enabled", !Pref.hideAds()); }
-
     private static void viewCount() {
         addFlag("view_counts_public_visibility_enabled", Pref.hideViewCount());
     }

extensions/twitter/src/main/java/app/revanced/extension/twitter/patches/TimelineEntry.java

@@ -2,7 +2,7 @@
 
 import com.twitter.model.json.timeline.urt.JsonTimelineEntry;
 import com.twitter.model.json.core.JsonSensitiveMediaWarning;
-
+import com.twitter.model.json.timeline.urt.JsonTimelineModuleItem;
 import app.revanced.extension.twitter.Pref;
 import app.revanced.extension.twitter.settings.SettingsStatus;
 
@@ -28,7 +28,7 @@ private static boolean isEntryIdRemove(String entryId) {
         String[] split = entryId.split("-");
         String entryId2 = split[0];
         if (!entryId2.equals("cursor") && !entryId2.equals("Guide") && !entryId2.startsWith("semantic_core")) {
-            if ((entryId.contains("promoted") || ((entryId2.equals("conversationthread") && split.length == 3))) && hideAds) {
+            if (entryId.contains("promoted") || ((entryId2.equals("conversationthread") && split.length == 3)) && hideAds) {
                 return true;
             }
             if ((entryId2.equals("superhero") || entryId2.equals("eventsummary")) && hideAds) {
@@ -83,6 +83,18 @@ public static JsonTimelineEntry checkEntry(JsonTimelineEntry jsonTimelineEntry)
         return jsonTimelineEntry;
     }
 
+    public static JsonTimelineModuleItem checkEntry(JsonTimelineModuleItem jsonTimelineModuleItem) {
+        try {
+            String entryId = jsonTimelineModuleItem.a;
+            if(isEntryIdRemove(entryId)){
+                return null;
+            }
+        } catch (Exception unused) {
+
+        }
+        return jsonTimelineModuleItem;
+    }
+
     public static JsonSensitiveMediaWarning sensitiveMedia(JsonSensitiveMediaWarning jsonSensitiveMediaWarning) {
         try {
             if(showSensitiveMedia){

extensions/twitter/stub/src/main/java/com/twitter/model/json/timeline/urt/JsonTimelineModuleItem.java

@@ -0,0 +1,5 @@
+package com.twitter.model.json.timeline.urt;
+
+public class JsonTimelineModuleItem {
+    public String a;
+}

patches/api/patches.api

@@ -319,8 +319,6 @@ public final class app/crimera/utils/UtilsKt {
 	public static final fun getMethodName (Lapp/revanced/patcher/patch/BytecodePatchContext;Lapp/revanced/patcher/Fingerprint;I)Ljava/lang/String;
 	public static final fun getReference (Lapp/revanced/patcher/patch/BytecodePatchContext;Lapp/revanced/patcher/Fingerprint;I)Lcom/android/tools/smali/dexlib2/iface/reference/Reference;
 	public static final fun instructionToString (Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;)Ljava/lang/String;
-	public static final fun mergeXmlResources (Lapp/revanced/patcher/patch/ResourcePatchContext;Ljava/lang/String;[Lapp/revanced/util/ResourceGroup;Ljava/lang/String;)V
-	public static synthetic fun mergeXmlResources$default (Lapp/revanced/patcher/patch/ResourcePatchContext;Ljava/lang/String;[Lapp/revanced/util/ResourceGroup;Ljava/lang/String;ILjava/lang/Object;)V
 	public static final fun replaceStringsInFile (Lapp/revanced/patcher/patch/ResourcePatchContext;Ljava/lang/String;Ljava/util/Map;)V
 	public static final fun replaceXmlResources (Lapp/revanced/patcher/patch/ResourcePatchContext;Ljava/lang/String;[Lapp/revanced/util/ResourceGroup;)V
 }

patches/src/main/kotlin/app/crimera/patches/twitter/ads/timelineEntryHook/TimelineEntryHookPatch.kt

@@ -15,15 +15,23 @@ private val timelineEntryHookFingerprint =
         }
     }
 
+private val timelineModuleItemHookFingerprint =
+    fingerprint {
+        returns("Ljava/lang/Object")
+        custom { it, _ ->
+            it.definingClass == "Lcom/twitter/model/json/timeline/urt/JsonTimelineModuleItem\$\$JsonObjectMapper;" && it.name == "parse"
+        }
+    }
+
 val timelineEntryHookPatch =
     bytecodePatch(
         description = "Hooks timeline object",
     ) {
         execute {
-            val methods = timelineEntryHookFingerprint.method
-            val instructions = methods.instructions
+            var methods = timelineEntryHookFingerprint.method
+            var instructions = methods.instructions
 
-            val returnObj = instructions.last { it.opcode == Opcode.RETURN_OBJECT }.location.index
+            var returnObj = instructions.last { it.opcode == Opcode.RETURN_OBJECT }.location.index
 
             methods.addInstructions(
                 returnObj,
@@ -32,6 +40,19 @@ val timelineEntryHookPatch =
                 move-result-object p1
                 """.trimIndent(),
             )
+
+            methods = timelineModuleItemHookFingerprint.method
+            instructions = methods.instructions
+
+            returnObj = instructions.last { it.opcode == Opcode.RETURN_OBJECT }.location.index
+
+            methods.addInstructions(
+                returnObj,
+                """
+                invoke-static {p1}, $PATCHES_DESCRIPTOR/TimelineEntry;->checkEntry(Lcom/twitter/model/json/timeline/urt/JsonTimelineModuleItem;)Lcom/twitter/model/json/timeline/urt/JsonTimelineModuleItem;
+                move-result-object p1
+                """.trimIndent(),
+            )
             // ends.
         }
     }

patches/src/main/kotlin/app/crimera/patches/twitter/misc/settings/SettingsResourcePatch.kt

@@ -1,9 +1,9 @@
 package app.crimera.patches.twitter.misc.settings
 
-import app.crimera.utils.mergeXmlResources
 import app.revanced.patcher.patch.resourcePatch
 import app.revanced.patches.shared.misc.mapping.resourceMappingPatch
 import app.revanced.util.ResourceGroup
+import app.revanced.util.copyResources
 import org.w3c.dom.Element
 import java.nio.file.Files
 
@@ -43,8 +43,8 @@ internal val settingsResourcePatch =
                 parent.appendChild(sideBtn)
             }
 
-            mergeXmlResources("twitter/settings", ResourceGroup("values", "strings.xml"))
-            mergeXmlResources("twitter/settings", ResourceGroup("values", "arrays.xml"))
+            copyResources("twitter/settings", ResourceGroup("values", "piko_strings.xml"))
+            copyResources("twitter/settings", ResourceGroup("values", "piko_arrays.xml"))
 
             /**
              * create directory for the untranslated language resources
@@ -75,10 +75,10 @@ internal val settingsResourcePatch =
                 if (!vDirectory.isDirectory) {
                     Files.createDirectories(vDirectory.toPath())
                     if (it.contains("v21")) {
-                        mergeXmlResources("twitter/settings", ResourceGroup(it, "arrays.xml"))
+                        copyResources("twitter/settings", ResourceGroup(it, "piko_arrays.xml"))
                     }
                 }
-                mergeXmlResources("twitter/settings", ResourceGroup(it, "strings.xml"))
+                copyResources("twitter/settings", ResourceGroup(it, "piko_strings.xml"))
             }
 
             // execute end

patches/src/main/kotlin/app/crimera/utils/Utils.kt

@@ -29,33 +29,6 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
 import com.android.tools.smali.dexlib2.iface.reference.Reference
 import org.w3c.dom.Element
 
-fun ResourcePatchContext.mergeXmlResources(
-    sourceResourceDirectory: String,
-    vararg resourceGroups: ResourceGroup,
-    tagName: String = "resources",
-) {
-    for (resourceGroup in resourceGroups) {
-        resourceGroup.resources.forEach { resource ->
-            val resourceFile = "${resourceGroup.resourceDirectoryName}/$resource"
-            val targetFile = get("res").resolve(resourceFile)
-
-            // If target file doesn't exist, use copyResources as fallback
-            if (!targetFile.exists()) {
-                copyResources(sourceResourceDirectory, resourceGroup)
-                return@forEach
-            }
-
-            inputStreamFromBundledResource(sourceResourceDirectory, resourceFile)?.let { inputStream ->
-                tagName
-                    .copyXmlNode(
-                        document(inputStream),
-                        document("res/$resourceFile"),
-                    ).close()
-            } ?: throw PatchException("Could not find $resourceFile in $sourceResourceDirectory")
-        }
-    }
-}
-
 fun ResourcePatchContext.replaceXmlResources(
     sourceResourceDirectory: String,
     vararg resourceGroups: ResourceGroup,

patches/src/main/kotlin/app/revanced/patches/all/misc/versioncode/ChangeVersionCodePatch.kt

@@ -31,7 +31,7 @@ val changeVersionCodePatch =
         execute {
             document("AndroidManifest.xml").use { document ->
                 val manifestElement = document.getNode("manifest") as Element
-                manifestElement.setAttribute("android:versionCode", versionCode.toString())
+                manifestElement.setAttribute("android:versionCode", "$versionCode")
             }
         }
     }