Fixes (#34)

* General improvements

- Fixed preferences not obtained properly.
- Cleaned up libraries and code.
- Update deps.

* Update README.md

integrations/AndroidManifest.xml

@@ -1,12 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="pl.jakubweg">
-
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:supportsRtl="true"
-        tools:ignore="AllowBackup" />
-
 </manifest>

integrations/java/pl/jakubweg/InjectedPlugin.java

@@ -92,7 +92,6 @@ public class InjectedPlugin {
             Log.i(TAG, spacesStr + "Normal view: " + view);
         }
     }
-
 }
 
 

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;

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();

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);

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();
         }
 

integrations/java/pl/jakubweg/SponsorBlockUtils.java

@@ -602,5 +602,4 @@ public abstract class SponsorBlockUtils {
             }
         }
     }
-
 }

integrations/java/pl/jakubweg/SponsorSegment.java

@@ -26,5 +26,4 @@ public class SponsorSegment implements Comparable<SponsorSegment> {
     public int compareTo(SponsorSegment o) {
         return (int) (this.start - o.start);
     }
-
 }

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();