refactor(Twitter): Added toggle for Show sensitive media patch

crimera · Nov 25, 2024 · a7a991c · a7a991c
1 parent b5dc850
commit a7a991c
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 2 deletions.
diff --git a/app/src/main/java/app/revanced/integrations/twitter/Pref.java b/app/src/main/java/app/revanced/integrations/twitter/Pref.java
@@ -23,6 +23,10 @@ public static float setPostFontSize() {
         }
         return fontSize;
     }
+    public static boolean showSensitiveMedia() {
+        return Utils.getBooleanPerf(Settings.TIMELINE_SHOW_SENSITIVE_MEDIA);
+    }
+
     public static boolean enableNativeDownloader() {
         return Utils.getBooleanPerf(Settings.VID_NATIVE_DOWNLOADER);
     }

diff --git a/app/src/main/java/app/revanced/integrations/twitter/patches/TimelineEntry.java b/app/src/main/java/app/revanced/integrations/twitter/patches/TimelineEntry.java
@@ -2,12 +2,13 @@
 
 import com.twitter.model.json.timeline.urt.JsonTimelineEntry;
 import com.twitter.model.json.timeline.urt.JsonTimelineModuleItem;
+import com.twitter.model.json.core.JsonSensitiveMediaWarning;
 
 import app.revanced.integrations.twitter.Pref;
 import app.revanced.integrations.twitter.settings.SettingsStatus;
 
 public class TimelineEntry {
-    private static final boolean hideAds,hideGAds,hideWTF,hideCTS,hideCTJ,hideDetailedPosts,hideRBMK,hidePinnedPosts,hidePremiumPrompt,hideMainEvent,hideSuperheroEvent,hideVideosForYou;
+    private static final boolean hideAds,hideGAds,hideWTF,hideCTS,hideCTJ,hideDetailedPosts,hideRBMK,hidePinnedPosts,hidePremiumPrompt,hideMainEvent,hideSuperheroEvent,hideVideosForYou,showSensitiveMedia;
     static {
         hideAds = (Pref.hideAds() && SettingsStatus.hideAds);
         hideGAds = (Pref.hideGoogleAds() && SettingsStatus.hideGAds);
@@ -21,6 +22,7 @@ public class TimelineEntry {
         hideMainEvent = (Pref.hideMainEvent() && SettingsStatus.hideMainEvent);
         hideSuperheroEvent = (Pref.hideSuperheroEvent() && SettingsStatus.hideSuperheroEvent);
         hideVideosForYou = (Pref.hideVideosForYou() && SettingsStatus.hideVideosForYou);
+        showSensitiveMedia = Pref.showSensitiveMedia();
     }
 
 
@@ -92,5 +94,18 @@ public static JsonTimelineModuleItem checkEntry(JsonTimelineModuleItem jsonTimel
         return jsonTimelineModuleItem;
     }
 
+    public static JsonSensitiveMediaWarning sensitiveMedia(JsonSensitiveMediaWarning jsonSensitiveMediaWarning) {
+        try {
+            if(showSensitiveMedia){
+                jsonSensitiveMediaWarning.a = false;
+                jsonSensitiveMediaWarning.b = false;
+                jsonSensitiveMediaWarning.c = false;
+            }
+        } catch (Exception unused) {
+
+        }
+        return jsonSensitiveMediaWarning;
+    }
+
 //end
 }
diff --git a/app/src/main/java/app/revanced/integrations/twitter/settings/ScreenBuilder.java b/app/src/main/java/app/revanced/integrations/twitter/settings/ScreenBuilder.java
@@ -710,6 +710,15 @@ public void buildTimelineSection(boolean buildCategory){
                     )
             );
         }
+        if (SettingsStatus.showSensitiveMedia) {
+            addPreference(category,
+                    helper.switchPreference(
+                            strRes("piko_pref_show_sensitive_media"),
+                            "",
+                            Settings.TIMELINE_SHOW_SENSITIVE_MEDIA
+                    )
+            );
+        }
     }
 
     public void buildExportSection(boolean buildCategory){

diff --git a/app/src/main/java/app/revanced/integrations/twitter/settings/Settings.java b/app/src/main/java/app/revanced/integrations/twitter/settings/Settings.java
@@ -59,6 +59,7 @@ public class Settings extends BaseSettings {
     public static final BooleanSetting TIMELINE_ENABLE_VID_AUTO_ADVANCE = new BooleanSetting("timeline_enable_vid_auto_advance", true);
     public static final BooleanSetting TIMELINE_ENABLE_VID_FORCE_HD = new BooleanSetting("timeline_enable_vid_force_hd", true);
     public static final BooleanSetting TIMELINE_HIDE_NUDGE_BUTTON = new BooleanSetting("timeline_hide_nudge_button", false);
+    public static final BooleanSetting TIMELINE_SHOW_SENSITIVE_MEDIA = new BooleanSetting("timeline_show_sensitive_media", true);
 
     public static final BooleanSetting PREMIUM_READER_MODE = new BooleanSetting("premium_reader_mode", false);
     public static final BooleanSetting PREMIUM_UNDO_POSTS = new BooleanSetting("premium_undo_posts", false);

diff --git a/app/src/main/java/app/revanced/integrations/twitter/settings/SettingsStatus.java b/app/src/main/java/app/revanced/integrations/twitter/settings/SettingsStatus.java
@@ -303,7 +303,7 @@ public static void inlineBarCustomisation() {
     }
 
     public static boolean enableTimelineSection() {
-        return ( hideNudgeButton || disableAutoTimelineScroll || forceTranslate || hidePromoteButton || hideCommunityNote || hideLiveThreads || hideBanner || hideInlineBmk || showPollResultsEnabled || hideImmersivePlayer || enableVidAutoAdvance || enableForceHD);
+        return ( showSensitiveMedia || hideNudgeButton || disableAutoTimelineScroll || forceTranslate || hidePromoteButton || hideCommunityNote || hideLiveThreads || hideBanner || hideInlineBmk || showPollResultsEnabled || hideImmersivePlayer || enableVidAutoAdvance || enableForceHD);
     }
 
     public static boolean enableMiscSection() {

diff --git a/stub/src/main/java/com/twitter/model/json/core/JsonSensitiveMediaWarning.java b/stub/src/main/java/com/twitter/model/json/core/JsonSensitiveMediaWarning.java
@@ -0,0 +1,7 @@
+package com.twitter.model.json.core;
+
+public class JsonSensitiveMediaWarning {
+    public boolean a;
+    public boolean b;
+    public boolean c;
+}