From b381e3373efd96812c0439753bb49e512eaec1b4 Mon Sep 17 00:00:00 2001 From: Oizaro <75915943+Oizaro@users.noreply.github.com> Date: Tue, 8 Jun 2021 18:25:01 +0200 Subject: [PATCH] Fixes (#34) * General improvements - Fixed preferences not obtained properly. - Cleaned up libraries and code. - Update deps. * Update README.md --- integrations/AndroidManifest.xml | 8 -------- integrations/java/pl/jakubweg/InjectedPlugin.java | 1 - .../java/pl/jakubweg/PlayerController.java | 10 ++++++++++ integrations/java/pl/jakubweg/ShieldButton.java | 15 --------------- .../jakubweg/SponsorBlockPreferenceFragment.java | 3 ++- .../java/pl/jakubweg/SponsorBlockSettings.java | 2 +- .../java/pl/jakubweg/SponsorBlockUtils.java | 1 - integrations/java/pl/jakubweg/SponsorSegment.java | 1 - integrations/java/pl/jakubweg/VotingButton.java | 15 --------------- 9 files changed, 13 insertions(+), 43 deletions(-) diff --git a/integrations/AndroidManifest.xml b/integrations/AndroidManifest.xml index 80c110cdc..430ba65c7 100644 --- a/integrations/AndroidManifest.xml +++ b/integrations/AndroidManifest.xml @@ -1,12 +1,4 @@ - - - \ No newline at end of file diff --git a/integrations/java/pl/jakubweg/InjectedPlugin.java b/integrations/java/pl/jakubweg/InjectedPlugin.java index 021038f68..bc6519a70 100644 --- a/integrations/java/pl/jakubweg/InjectedPlugin.java +++ b/integrations/java/pl/jakubweg/InjectedPlugin.java @@ -92,7 +92,6 @@ public class InjectedPlugin { Log.i(TAG, spacesStr + "Normal view: " + view); } } - } diff --git a/integrations/java/pl/jakubweg/PlayerController.java b/integrations/java/pl/jakubweg/PlayerController.java index d20efc5dc..c06d0e58d 100644 --- a/integrations/java/pl/jakubweg/PlayerController.java +++ b/integrations/java/pl/jakubweg/PlayerController.java @@ -2,6 +2,7 @@ package pl.jakubweg; import android.annotation.SuppressLint; import android.app.Activity; +import android.content.Context; import android.graphics.Canvas; import android.graphics.Rect; import android.os.Handler; @@ -10,6 +11,8 @@ import android.util.Log; import android.view.View; import android.view.ViewGroup; +import com.google.android.apps.youtube.app.YouTubeTikTokRoot_Application; + import java.lang.ref.WeakReference; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -59,6 +62,13 @@ public class PlayerController { VideoInformation.currentVideoId = videoId; + Context context = YouTubeTikTokRoot_Application.getAppContext(); + if(context == null){ + Log.e(TAG, "context is null"); + return; + } + SponsorBlockSettings.update(context); + if (!SponsorBlockSettings.isSponsorBlockEnabled) { currentVideoId = null; return; diff --git a/integrations/java/pl/jakubweg/ShieldButton.java b/integrations/java/pl/jakubweg/ShieldButton.java index 670174c7c..0acaf4f3e 100644 --- a/integrations/java/pl/jakubweg/ShieldButton.java +++ b/integrations/java/pl/jakubweg/ShieldButton.java @@ -34,7 +34,6 @@ public class ShieldButton { } _youtubeControlsLayout = (RelativeLayout) viewStub; - initButtonVisibilitySettings(); ImageView imageView = (ImageView)_youtubeControlsLayout .findViewById(getIdentifier("sponsorblock_button", "id")); @@ -107,20 +106,6 @@ public class ShieldButton { return SponsorBlockSettings.isSponsorBlockEnabled && SponsorBlockSettings.isAddNewSegmentEnabled; } - private static void initButtonVisibilitySettings() { - Context context = YouTubeTikTokRoot_Application.getAppContext(); - if(context == null){ - Log.e(TAG, "context is null"); - SponsorBlockSettings.isSponsorBlockEnabled = false; - SponsorBlockSettings.isAddNewSegmentEnabled = false; - return; - } - - SharedPreferences sharedPreferences = context.getSharedPreferences(SponsorBlockSettings.PREFERENCES_NAME, Context.MODE_PRIVATE); - SponsorBlockSettings.isSponsorBlockEnabled = sharedPreferences.getBoolean(SponsorBlockSettings.PREFERENCES_KEY_SPONSOR_BLOCK_ENABLED, false); - SponsorBlockSettings.isAddNewSegmentEnabled = sharedPreferences.getBoolean(SponsorBlockSettings.PREFERENCES_KEY_NEW_SEGMENT_ENABLED, false); - } - //region Helpers private static int getIdentifier(String name, String defType) { Context context = YouTubeTikTokRoot_Application.getAppContext(); diff --git a/integrations/java/pl/jakubweg/SponsorBlockPreferenceFragment.java b/integrations/java/pl/jakubweg/SponsorBlockPreferenceFragment.java index 8e44e38be..e29c651b8 100644 --- a/integrations/java/pl/jakubweg/SponsorBlockPreferenceFragment.java +++ b/integrations/java/pl/jakubweg/SponsorBlockPreferenceFragment.java @@ -36,7 +36,6 @@ import static pl.jakubweg.SponsorBlockSettings.showToastWhenSkippedAutomatically import static pl.jakubweg.SponsorBlockSettings.uuid; import static pl.jakubweg.StringRef.str; - @SuppressWarnings({"unused", "deprecation"}) // injected public class SponsorBlockPreferenceFragment extends PreferenceFragment implements SharedPreferences.OnSharedPreferenceChangeListener { @@ -54,6 +53,8 @@ public class SponsorBlockPreferenceFragment extends PreferenceFragment implement PreferenceScreen preferenceScreen = getPreferenceManager().createPreferenceScreen(context); setPreferenceScreen(preferenceScreen); + SponsorBlockSettings.update(context); + { SwitchPreference preference = new SwitchPreference(context); preferenceScreen.addPreference(preference); diff --git a/integrations/java/pl/jakubweg/SponsorBlockSettings.java b/integrations/java/pl/jakubweg/SponsorBlockSettings.java index 12821f002..d2a0f12e8 100644 --- a/integrations/java/pl/jakubweg/SponsorBlockSettings.java +++ b/integrations/java/pl/jakubweg/SponsorBlockSettings.java @@ -86,7 +86,7 @@ public class SponsorBlockSettings { SponsorBlockUtils.hideShieldButton(); SponsorBlockUtils.hideVoteButton(); PlayerController.sponsorSegmentsOfCurrentVideo = null; - } else if (/*isAddNewSegmentEnabled*/false) { + } else { /*isAddNewSegmentEnabled*/ SponsorBlockUtils.showShieldButton(); } diff --git a/integrations/java/pl/jakubweg/SponsorBlockUtils.java b/integrations/java/pl/jakubweg/SponsorBlockUtils.java index 41e73be84..117572976 100644 --- a/integrations/java/pl/jakubweg/SponsorBlockUtils.java +++ b/integrations/java/pl/jakubweg/SponsorBlockUtils.java @@ -602,5 +602,4 @@ public abstract class SponsorBlockUtils { } } } - } diff --git a/integrations/java/pl/jakubweg/SponsorSegment.java b/integrations/java/pl/jakubweg/SponsorSegment.java index f96117d0d..b6ea2d48c 100644 --- a/integrations/java/pl/jakubweg/SponsorSegment.java +++ b/integrations/java/pl/jakubweg/SponsorSegment.java @@ -26,5 +26,4 @@ public class SponsorSegment implements Comparable { public int compareTo(SponsorSegment o) { return (int) (this.start - o.start); } - } diff --git a/integrations/java/pl/jakubweg/VotingButton.java b/integrations/java/pl/jakubweg/VotingButton.java index b0bd09e6a..9b9f558b9 100644 --- a/integrations/java/pl/jakubweg/VotingButton.java +++ b/integrations/java/pl/jakubweg/VotingButton.java @@ -34,7 +34,6 @@ public class VotingButton { } _youtubeControlsLayout = (RelativeLayout) viewStub; - initButtonVisibilitySettings(); ImageView imageView = (ImageView)_youtubeControlsLayout .findViewById(getIdentifier("voting_button", "id")); @@ -107,20 +106,6 @@ public class VotingButton { return SponsorBlockSettings.isVotingEnabled && SponsorBlockSettings.isSponsorBlockEnabled; } - private static void initButtonVisibilitySettings() { - Context context = YouTubeTikTokRoot_Application.getAppContext(); - if(context == null){ - Log.e(TAG, "context is null"); - SponsorBlockSettings.isSponsorBlockEnabled = false; - SponsorBlockSettings.isVotingEnabled = false; - return; - } - - SharedPreferences sharedPreferences = context.getSharedPreferences(SponsorBlockSettings.PREFERENCES_NAME, Context.MODE_PRIVATE); - SponsorBlockSettings.isSponsorBlockEnabled = sharedPreferences.getBoolean(SponsorBlockSettings.PREFERENCES_KEY_SPONSOR_BLOCK_ENABLED, false); - SponsorBlockSettings.isVotingEnabled = sharedPreferences.getBoolean(SponsorBlockSettings.PREFERENCES_KEY_VOTING_ENABLED, false); - } - //region Helpers private static int getIdentifier(String name, String defType) { Context context = YouTubeTikTokRoot_Application.getAppContext();