Performance improvement

exoplayeractivity/src/main/java/com/liskovsoft/smartyoutubetv/flavors/exoplayer/player/dialogs/speed/SpeedDialogSource.java

@@ -1,6 +1,7 @@
 package com.liskovsoft.smartyoutubetv.flavors.exoplayer.player.dialogs.speed;
 
 import android.content.Context;
+
 import com.google.android.exoplayer2.SimpleExoPlayer;
 import com.liskovsoft.exoplayeractivity.R;
 import com.liskovsoft.sharedutils.dialogs.GenericSelectorDialog.CombinedDialogSource;
@@ -12,31 +13,29 @@
 
 public class SpeedDialogSource implements CombinedDialogSource {
     private final Context mContext;
-    private final SimpleExoPlayer mPlayer;
-    private final ArrayList<DialogItem> mItems;
-    private final ExoPreferences mPrefs;
+    private final List<DialogItem> mItems;
 
     public SpeedDialogSource(ExoPlayerFragment playerFragment) {
         mContext = playerFragment.getActivity();
-        mPlayer = playerFragment.getPlayer();
-        mPrefs = ExoPreferences.instance(mContext);
+        SimpleExoPlayer player = playerFragment.getPlayer();
+        ExoPreferences preferences = ExoPreferences.instance(mContext);
 
         mItems = new ArrayList<>();
-        mItems.add(new SaveSpeedDialogItem(mContext.getString(R.string.checkbox_save_speed), mPrefs));
-        mItems.add(new SpeedDialogItem("0.25", "0.25", mPlayer, mPrefs));
-        mItems.add(new SpeedDialogItem("0.5", "0.5", mPlayer, mPrefs));
-        mItems.add(new SpeedDialogItem("0.75", "0.75", mPlayer, mPrefs));
-        mItems.add(new SpeedDialogItem(mContext.getString(R.string.normal), "1.0", mPlayer, mPrefs));
-        mItems.add(new SpeedDialogItem("1.25", "1.25", mPlayer, mPrefs));
-        mItems.add(new SpeedDialogItem("1.5", "1.5", mPlayer, mPrefs));
-        mItems.add(new SpeedDialogItem("1.75", "1.75", mPlayer, mPrefs));
-        mItems.add(new SpeedDialogItem("2", "2.0", mPlayer, mPrefs));
-        mItems.add(new SpeedDialogItem("2.25", "2.25", mPlayer, mPrefs));
-        mItems.add(new SpeedDialogItem("2.5", "2.5", mPlayer, mPrefs));
-        mItems.add(new SpeedDialogItem("2.75", "2.75", mPlayer, mPrefs));
-
-        if (mPlayer != null) {
-            SpeedDialogItem.sCurrentSpeed = String.valueOf(mPlayer.getPlaybackParameters().speed);
+        mItems.add(new SaveSpeedDialogItem(mContext.getString(R.string.checkbox_save_speed), preferences));
+        mItems.add(new SpeedDialogItem("0.25", "0.25", player, preferences));
+        mItems.add(new SpeedDialogItem("0.5", "0.5", player, preferences));
+        mItems.add(new SpeedDialogItem("0.75", "0.75", player, preferences));
+        mItems.add(new SpeedDialogItem(mContext.getString(R.string.normal), "1.0", player, preferences));
+        mItems.add(new SpeedDialogItem("1.25", "1.25", player, preferences));
+        mItems.add(new SpeedDialogItem("1.5", "1.5", player, preferences));
+        mItems.add(new SpeedDialogItem("1.75", "1.75", player, preferences));
+        mItems.add(new SpeedDialogItem("2", "2.0", player, preferences));
+        mItems.add(new SpeedDialogItem("2.25", "2.25", player, preferences));
+        mItems.add(new SpeedDialogItem("2.5", "2.5", player, preferences));
+        mItems.add(new SpeedDialogItem("2.75", "2.75", player, preferences));
+
+        if (player != null) {
+            SpeedDialogItem.sCurrentSpeed = String.valueOf(player.getPlaybackParameters().speed);
         }
     }
 

smartyoutubetv/src/main/java/com/liskovsoft/smartyoutubetv/flavors/exoplayer/youtubeinfoparser/parsers/ParserUtils.java

@@ -1,6 +1,7 @@
 package com.liskovsoft.smartyoutubetv.flavors.exoplayer.youtubeinfoparser.parsers;
 
 import android.net.Uri;
+
 import com.google.gson.JsonArray;
 import com.google.gson.JsonSyntaxException;
 import com.jayway.jsonpath.Configuration;
@@ -15,9 +16,18 @@
 
 import java.io.InputStream;
 
-public class ParserUtils {
+public final class ParserUtils {
+
     private static final String TAG = ParserUtils.class.getSimpleName();
 
+    private static final Configuration JSON_PATH_CONFIGURATION = Configuration.builder()
+            .mappingProvider(new GsonMappingProvider())
+            .jsonProvider(new GsonJsonProvider())
+            .build();
+
+    private ParserUtils() {
+    }
+
     public static String extractParam(String queryParam, String content) {
         Uri videoInfo = parseUri(content);
         String value = videoInfo.getQueryParameter(queryParam);
@@ -52,19 +62,13 @@ public static <T> DocumentContext createJsonInfoParser(T jsonInfo) {
             throw new IllegalStateException("Can't create parser. jsonInfo == null");
         }
 
-        Configuration conf = Configuration
-                .builder()
-                .mappingProvider(new GsonMappingProvider())
-                .jsonProvider(new GsonJsonProvider())
-                .build();
-
         DocumentContext jsonPath;
 
         try {
             if (jsonInfo instanceof InputStream) {
-                jsonPath = JsonPath.using(conf).parse((InputStream) jsonInfo, "UTF-8");
+                jsonPath = JsonPath.using(JSON_PATH_CONFIGURATION).parse((InputStream) jsonInfo);
             } else if (jsonInfo instanceof String) {
-                jsonPath = JsonPath.using(conf).parse((String) jsonInfo);
+                jsonPath = JsonPath.using(JSON_PATH_CONFIGURATION).parse((String) jsonInfo);
             } else {
                 throw new IllegalStateException("Can't create parser. Unknown input type: " + jsonInfo.getClass().getSimpleName());
             }
@@ -110,8 +114,8 @@ private static <T> T extractType(String jsonPath, DocumentContext parser) {
 
         return result;
     }
-    
-    public static void delete(String jsonPath, DocumentContext parser) {
+
+    public static void delete(JsonPath jsonPath, DocumentContext parser) {
         try {
             parser.delete(jsonPath);
         } catch (PathNotFoundException e) { // NOTE: exception isn't thrown in some cases
@@ -120,7 +124,7 @@ public static void delete(String jsonPath, DocumentContext parser) {
         }
     }
 
-    public static boolean exists(String jsonPath, DocumentContext parser) {
+    public static boolean exists(JsonPath jsonPath, DocumentContext parser) {
         boolean result;
 
         try {

smartyoutubetv/src/main/java/com/liskovsoft/smartyoutubetv/interceptors/RequestInterceptorProcessor.java

@@ -39,7 +39,8 @@ public WebResourceResponse process(String url) {
 
         WebResourceResponse result = null;
 
-        for (RequestInterceptor interceptor : mInterceptors) {
+        for (int i = 0; i < mInterceptors.size(); i++) {
+            RequestInterceptor interceptor = mInterceptors.get(i);
             if (interceptor.test(url)) {
                 result = interceptor.intercept(url);
 

smartyoutubetv/src/main/java/com/liskovsoft/smartyoutubetv/interceptors/ads/AdAwayInterceptor.java

@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.webkit.WebResourceResponse;
+
 import com.liskovsoft.sharedutils.mylogger.Log;
 import com.liskovsoft.smartyoutubetv.CommonApplication;
 import com.liskovsoft.smartyoutubetv.interceptors.RequestInterceptor;
@@ -29,11 +30,10 @@ public AdAwayInterceptor(Context context) {
 
     @Override
     public boolean test(String url) {
-        if (mClient.isAd(url)) {
-            return mAdBlockEnabled;
-        } else {
-            return false;
+        if (mAdBlockEnabled) {
+            return mClient.isAd(url);
         }
+        return false;
     }
 
     @Override

smartyoutubetv/src/main/java/com/liskovsoft/smartyoutubetv/interceptors/ads/BrowseInterceptor.java

@@ -3,11 +3,12 @@
 import android.content.Context;
 import android.webkit.WebResourceResponse;
 
+import com.liskovsoft.m3uparser.core.utils.Strings;
 import com.liskovsoft.sharedutils.helpers.AssetHelper;
-import com.liskovsoft.sharedutils.helpers.Helpers;
 import com.liskovsoft.sharedutils.mylogger.Log;
 import com.liskovsoft.smartyoutubetv.CommonApplication;
 import com.liskovsoft.smartyoutubetv.interceptors.RequestInterceptor;
+import com.liskovsoft.smartyoutubetv.interceptors.ads.contentfilter.ReplacingInputStream;
 import com.liskovsoft.smartyoutubetv.misc.SmartUtils;
 import com.liskovsoft.smartyoutubetv.misc.UserAgentManager;
 import com.liskovsoft.smartyoutubetv.prefs.SmartPreferences;
@@ -36,6 +37,7 @@ public class BrowseInterceptor extends RequestInterceptor {
     private boolean mIsXWalk;
     private boolean mIsAdBlockEnabled;
     private boolean mIsEnableVideoMenu;
+    private boolean mIsCompatibleSettings;
 
     public BrowseInterceptor(Context context) {
         super(context);
@@ -44,6 +46,7 @@ public BrowseInterceptor(Context context) {
         mIsXWalk = SmartUtils.isXWalk(mContext);
         mIsAdBlockEnabled = mPrefs.isAdBlockEnabled();
         mIsEnableVideoMenu = mPrefs.getEnableVideoMenu();
+        mIsCompatibleSettings = mIsEnableVideoMenu || (mIsAdBlockEnabled && !mIsXWalk);
         initHeaders();
     }
 
@@ -57,7 +60,7 @@ private void initHeaders() {
 
     @Override
     public boolean test(String url) {
-        return url != null && url.contains(BROWSE_URL);
+        return mIsCompatibleSettings && (url != null && url.contains(BROWSE_URL));
     }
 
     @Override
@@ -82,7 +85,7 @@ private WebResourceResponse filterBannerData(String url) {
 
         String postData = mPrefs.getPostData();
 
-        if (postData == null) {
+        if (Strings.isNullOrEmpty(postData)) {
             Log.e(TAG, "Post body is empty! Skipping url: " + url);
             return null;
         }
@@ -97,34 +100,16 @@ private WebResourceResponse filterBannerData(String url) {
 
         InputStream urlData = postJsonData(url, postData, mHeaders);
 
-        WebResourceResponse response = null;
-
-        if (Log.getLogType().equals(Log.LOG_TYPE_FILE) && urlData != null) {
-            String content = Helpers.toString(urlData);
-            Log.d(TAG, "Url: " + url + ". Post Data: " + postData + ". Response: " + content);
-            urlData = Helpers.toStream(content);
-        }
-
-        if (urlData != null) {
-            Log.d(TAG, "Searching and removing tv masthead section...");
-            JsonBrowseParser browseParser = JsonBrowseParser.parse(urlData);
-
-            if (browseParser.removeMastHead()) {
-                Log.d(TAG, "Success. TV masthead has been removed.");
-            } else {
-                if (Log.getLogType().equals(Log.LOG_TYPE_FILE)) {
-                    Log.d(TAG, "Oops. Response doesn't contain MustHead section. Url: " + url + ". Post Data: " + postData + ". Response: " + Helpers.toString(browseParser.toStream()));
-                } else {
-                    Log.d(TAG, "Oops. Response doesn't contain MustHead section. Url: " + url + ". Post Data: " + postData);
-                }
-            }
-
-            response = createResponse("application/json", null, browseParser.toStream());
-        } else {
+        if (urlData == null) {
             Log.e(TAG, "Error. Response in empty. Url: " + url + ". Post Data: " + postData);
+            return null;
         }
 
-        return response;
+        Log.d(TAG, "Searching and removing tv masthead section...");
+
+        ReplacingInputStream replacingInputStream = new ReplacingInputStream(urlData, "tvMastheadRenderer", "broken-tvMastheadRend");
+
+        return createResponse("application/json", null, replacingInputStream);
     }
 
     private WebResourceResponse filterLongPressVideoMenu(String url) {

smartyoutubetv/src/main/java/com/liskovsoft/smartyoutubetv/interceptors/ads/JsonBrowseParser.java

@@ -1,6 +1,7 @@
 package com.liskovsoft.smartyoutubetv.interceptors.ads;
 
 import com.jayway.jsonpath.DocumentContext;
+import com.jayway.jsonpath.JsonPath;
 import com.liskovsoft.sharedutils.helpers.Helpers;
 import com.liskovsoft.smartyoutubetv.flavors.exoplayer.youtubeinfoparser.parsers.ParserUtils;
 
@@ -9,7 +10,7 @@
 public class JsonBrowseParser {
     // All objects with property 'tvMastheadRenderer'
     // ex: https://github.com/json-path/JsonPath
-    private static final String TV_MASTHEAD_SECTION_ANY = "$..[?(@.tvMastheadRenderer)]";
+    private static final JsonPath TV_MASTHEAD_SECTION_ANY = JsonPath.compile("$..[?(@.tvMastheadRenderer)]");
 
     private final DocumentContext mParser;