feat(Twitter): Added Disunify xchat system patch

Author: swakwork

extensions/twitter/src/main/java/app/revanced/extension/twitter/Pref.java

@@ -398,5 +398,8 @@ public static boolean hidePostDetailedMetrics(){
         return Utils.getBooleanPerf(Settings.TIMELINE_HIDE_POST_DETAILED_METRICS);
     }
 
+    public static boolean disUnifyXChatSystem(){
+        return !Utils.getBooleanPerf(Settings.MISC_DISUNIFY_XCHAT_SYSTEM);
+    }
     //end
 }

extensions/twitter/src/main/java/app/revanced/extension/twitter/settings/ScreenBuilder.java

@@ -465,6 +465,17 @@ public void buildMiscSection(boolean buildCategory){
             );
         }
 
+
+        if (SettingsStatus.disUnifyXChatSystem) {
+            addPreference(category,
+                    helper.switchPreference(
+                            strRes("piko_disunify_xchat_system"),
+                            strRes("piko_disunify_xchat_system_desc"),
+                            Settings.MISC_DISUNIFY_XCHAT_SYSTEM
+                    )
+            );
+        }
+
     }
 
     public void buildFeatureFlagsSection(boolean buildCategory){

extensions/twitter/src/main/java/app/revanced/extension/twitter/settings/Settings.java

@@ -28,6 +28,7 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting MISC_HIDE_SOCIAL_PROOF = new BooleanSetting("misc_hide_social_proof", false);
     public static final BooleanSetting MISC_HIDE_SEARCH_SUGGESTIONS = new BooleanSetting("misc_hide_search_suggestions", false);
     public static final BooleanSetting MISC_PAUSE_SEARCH_SUGGESTIONS = new BooleanSetting("misc_pause_search_suggestions", false);
+    public static final BooleanSetting MISC_DISUNIFY_XCHAT_SYSTEM = new BooleanSetting("MISC_DISUNIFY_XCHAT_SYSTEM", true);
 
     public static final BooleanSetting ADS_HIDE_PROMOTED_TRENDS = new BooleanSetting("ads_hide_promoted_trends", true);
     public static final BooleanSetting ADS_HIDE_PROMOTED_POSTS = new BooleanSetting("ads_hide_promoted_posts", true);

extensions/twitter/src/main/java/app/revanced/extension/twitter/settings/SettingsStatus.java

@@ -352,12 +352,17 @@ public static void hidePostMetrics() {
         hidePostMetrics = true;
     }
 
+    public static boolean disUnifyXChatSystem = false;
+    public static void disUnifyXChatSystem() {
+        disUnifyXChatSystem = true;
+    }
+
     public static boolean enableTimelineSection() {
         return ( hidePostMetrics || hideNavbarBadge || showSourceLabel || hideCommBadge || showSensitiveMedia || hideNudgeButton || disableAutoTimelineScroll || forceTranslate || hidePromoteButton || hideCommunityNote || hideLiveThreads || hideBanner || hideInlineBmk || showPollResultsEnabled || hideImmersivePlayer || enableVidAutoAdvance || enableForceHD);
     }
 
     public static boolean enableMiscSection() {
-        return ( pauseSearchSuggestions || removeSearchSuggestions || hideSocialProof || roundOffNumbers || enableFontMod || hideRecommendedUsers || hideFAB || hideViewCount || customSharingDomainEnabled || hideFABBtns);
+        return ( disUnifyXChatSystem || pauseSearchSuggestions || removeSearchSuggestions || hideSocialProof || roundOffNumbers || enableFontMod || hideRecommendedUsers || hideFAB || hideViewCount || customSharingDomainEnabled || hideFABBtns);
     }
 
     public static boolean enableAdsSection() {

extensions/twitter/src/main/java/app/revanced/extension/twitter/settings/fragments/SettingsAboutFragment.java

@@ -133,6 +133,7 @@ public void onCreate(@org.jetbrains.annotations.Nullable Bundle savedInstanceSta
         flags.put(strRes("piko_pref_customisation_change_app_icon"),SettingsStatus.appIconCustomisation);
         flags.put(strRes("piko_pref_hide_badge_nav_bar"),SettingsStatus.hideNavbarBadge);
         flags.put(strRes("piko_pref_hide_post_inline_metrics"),SettingsStatus.hidePostMetrics);
+        flags.put(strRes("piko_disunify_xchat_system"),SettingsStatus.disUnifyXChatSystem);
 
         LegacyTwitterPreferenceCategory patPref = preferenceCategory(strRes("piko_pref_patches"), screen);
 

patches/src/main/kotlin/app/crimera/patches/twitter/misc/disUnifyXChatSystem/DisUnifyXChatSystemPatch.kt

@@ -0,0 +1,47 @@
+package app.crimera.patches.twitter.misc.disUnifyXChatSystem
+
+import app.crimera.patches.twitter.misc.settings.settingsPatch
+import app.crimera.patches.twitter.misc.settings.settingsStatusLoadFingerprint
+import app.crimera.utils.Constants.PREF_DESCRIPTOR
+import app.crimera.utils.enableSettings
+import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
+import app.revanced.patcher.extensions.InstructionExtensions.instructions
+import app.revanced.patcher.fingerprint
+import app.revanced.patcher.patch.bytecodePatch
+import app.revanced.patcher.util.smali.ExternalLabel
+import com.android.tools.smali.dexlib2.Opcode
+
+internal val xchatSubSystemUserCheckFingerprint =
+    fingerprint {
+        returns("Z")
+        strings(
+            "userId",
+            "xchat_unified_tab_min_snowflake_user_id",
+        )
+    }
+
+@Suppress("unused")
+val disUnifyXchatSystemPatch =
+    bytecodePatch(
+        name = "Disunify xchat system",
+        description = "Bring back legacy features like messages and share sheet.",
+    ) {
+        compatibleWith("com.twitter.android")
+        dependsOn(settingsPatch)
+
+        execute {
+            xchatSubSystemUserCheckFingerprint.method.apply {
+                addInstructionsWithLabels(
+                    0,
+                    """
+                    invoke-static {}, $PREF_DESCRIPTOR;->disUnifyXChatSystem()Z
+                    move-result v0
+                    if-nez v0, :piko
+                    return v0
+                    """.trimIndent(),
+                    ExternalLabel("piko", instructions.first { it.opcode == Opcode.CONST_STRING }),
+                )
+                settingsStatusLoadFingerprint.enableSettings("disUnifyXChatSystem")
+            }
+        }
+    }

patches/src/main/kotlin/app/crimera/patches/twitter/misc/shareMenu/fingerprints/ShareMenuButtonFuncCallFingerprint.kt

@@ -24,6 +24,7 @@ internal val shareMenuButtonFuncCallFingerprint =
             "tweet_analytics",
             "author_moderated_replies_author_enabled",
             "conversational_replies_android_pinned_replies_creation_enabled",
+            "share_menu_click",
         )
     }
 

patches/src/main/resources/twitter/settings/strings/values/strings.xml

@@ -101,6 +101,8 @@
     <string name="piko_pref_pause_search_suggestion_desc">Search suggestions will not be saved locally</string>
     <string name="piko_pref_search_suggestion">search suggestions</string>
     <string name="piko_pref_search_suggestion_desc">Hide/Remove search suggestion in explore section</string>
+    <string name="piko_disunify_xchat_system">Disunify xchat system</string>
+    <string name="piko_disunify_xchat_system_desc">Bring back legacy features like messages and share sheet</string>
 
     <!-- Feature flags Settings -->
     <string name="piko_title_feature_flags">Feature flags</string>