Version 2.1.0 (#13)

* improve parsing script

* 2.0.3

* autoplay option for animated GIFs

* protect `checkLength`

Author: anegrin

app/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "io.github.chiver"
         minSdkVersion 24
         targetSdkVersion 28
-        versionCode 202
-        versionName "2.0.2"
+        versionCode 210
+        versionName "2.1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

app/src/main/assets/script.js

@@ -1,7 +1,28 @@
 document.addEventListener('DOMContentLoaded', (event) => {
-    setTimeout(function(){
+
+    var attempts = 0;
+    var limit = 5;
+    var checkLength=2;
+
+    try {
+        var expected = CHIVE_GALLERY_ITEMS.items.length;
+        if (expected > checkLength){
+            checkLength = expected;
+        }
+        console.info("Chiver is expecting " + checkLength + " items");
+    } catch (e) {}
+
+    var parse = function() {
         console.info("Chiver is parsing :)");
+
         var nodes = document.querySelectorAll('div.gallery-icon > img,div.gallery-icon > video > source');
+
+        if (nodes.length < checkLength && attempts < limit) {
+            attempts++;
+            setTimeout(parse, 500);
+            return;
+        }
+
         for(var i=0;i<nodes.length; i++){
             var a = nodes[i];
             var url = a.getAttribute("src");
@@ -17,5 +38,9 @@ document.addEventListener('DOMContentLoaded', (event) => {
             }
         }
         wai.notifyDataSetChanged();
+   }
+
+    setTimeout(function(){
+        parse();
     }, 500);
 });

app/src/main/java/io/github/chiver/BaseActivity.java

@@ -63,6 +63,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 return onRefresh(item);
             case R.id.mi_share:
                 return onShare(item);
+            case R.id.mi_autoplay:
+                return onAutoplay(item);
             case R.id.mi_browse:
                 return onBrowse(item);
             case R.id.mi_info:
@@ -93,4 +95,8 @@ boolean onBrowse(MenuItem item) {
         return true;
     }
 
+    boolean onAutoplay(MenuItem item) {
+        return true;
+    }
+
 }

app/src/main/java/io/github/chiver/Chiver.java

@@ -1,6 +1,7 @@
 package io.github.chiver;
 
 import android.app.Application;
+import android.content.SharedPreferences;
 import android.util.Log;
 
 import com.android.volley.RequestQueue;
@@ -17,10 +18,13 @@
 @SuppressWarnings("WeakerAccess")
 public class Chiver extends Application {
 
+    private static final String PREF_AUTOPLAY = "autoplay";
+
     private SimpleDiskCache simpleDiskCache;
     private RequestQueue requestQueue;
     private String script;
     private String parser;
+    private SharedPreferences preferences;
 
     public Chiver() {
     }
@@ -36,6 +40,7 @@ public void onCreate() {
 
         StringRequest stringRequest = new StringRequest(Constants.REMOTE_SCRIPT_URL, response -> script = response, error -> Log.i(Constants.TAG, "Can't load remote script, using local asset"));
         getRequestQueue().add(stringRequest);
+        preferences = getSharedPreferences(getClass().getSimpleName(), MODE_PRIVATE);
     }
 
     public SimpleDiskCache getSimpleDiskCache() {
@@ -66,4 +71,14 @@ public synchronized RequestQueue getRequestQueue() {
         return this.requestQueue;
 
     }
+
+    public void setAutoplayEnabled(boolean enabled) {
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putBoolean(PREF_AUTOPLAY, enabled);
+        editor.apply();
+    }
+
+    public boolean isAutoplayEnabled() {
+        return preferences.getBoolean(PREF_AUTOPLAY, false);
+    }
 }

app/src/main/java/io/github/chiver/GalleryActivity.java

@@ -58,6 +58,7 @@ protected void _onCreate(Bundle savedInstanceState) {
     @Override
     protected void _onCreateOptionsMenu(Menu menu) {
         menu.findItem(R.id.mi_refresh).setVisible(false);
+        menu.findItem(R.id.mi_autoplay).setVisible(false);
         menu.findItem(R.id.mi_share).setVisible(false);
         menu.findItem(R.id.mi_browse).setVisible(true);
     }

app/src/main/java/io/github/chiver/ItemActivity.java

@@ -8,6 +8,7 @@
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import androidx.annotation.NonNull;
 import androidx.core.app.ShareCompat;
@@ -32,6 +33,7 @@ public class ItemActivity extends BaseActivity {
     private String[] urls;
     private View ivPrev;
     private View ivNext;
+    private MenuItem miAutoplay;
 
     public ItemActivity() {
         super(false);
@@ -118,10 +120,29 @@ public void onAnimationRepeat(Animation animation) {
     @Override
     protected void _onCreateOptionsMenu(Menu menu) {
         menu.findItem(R.id.mi_refresh).setVisible(false);
+        miAutoplay = menu.findItem(R.id.mi_autoplay);
+        miAutoplay.setVisible(true);
+        menu.findItem(R.id.mi_browse).setVisible(true);
+
+        if (getChiver().isAutoplayEnabled()) {
+            miAutoplay.setIcon(R.drawable.ic_disable_autoplay);
+        }
         menu.findItem(R.id.mi_share).setVisible(true);
         menu.findItem(R.id.mi_browse).setVisible(false);
     }
 
+    @Override
+    protected boolean onAutoplay(MenuItem item) {
+
+        boolean enabled = getChiver().isAutoplayEnabled();
+
+        Toast.makeText(this, enabled ? R.string.disablingAutoplay : R.string.enablingAutoplay, Toast.LENGTH_SHORT).show();
+        getChiver().setAutoplayEnabled(!enabled);
+        miAutoplay.setIcon(enabled ? R.drawable.ic_enable_autoplay : R.drawable.ic_disable_autoplay);
+
+        return super.onAutoplay(item);
+    }
+
     @Override
     protected int getContentView() {
         return R.layout.activity_item;
@@ -162,7 +183,7 @@ private class ItemAdapter extends FragmentStatePagerAdapter {
         @NonNull
         @Override
         public Fragment getItem(int position) {
-            return new ItemFragment(urls[position], imageLoader);
+            return new ItemFragment(urls[position], imageLoader, getChiver().isAutoplayEnabled());
         }
 
         @Override

app/src/main/java/io/github/chiver/ItemFragment.java

@@ -10,11 +10,12 @@
 import android.webkit.WebViewClient;
 import android.widget.ImageView;
 
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.Fragment;
+
 import com.android.volley.toolbox.ImageLoader;
 import com.android.volley.toolbox.NetworkImageView;
 
-import androidx.core.content.ContextCompat;
-import androidx.fragment.app.Fragment;
 import io.github.chiver.model.GalleryItem;
 
 @SuppressWarnings("WeakerAccess")
@@ -36,11 +37,13 @@ public class ItemFragment extends Fragment {
             "</html>";
     private final String url;
     private final ImageLoader imageLoader;
+    private final boolean autoplayEnabled;
     private View rootView;
 
-    public ItemFragment(String url, ImageLoader imageLoader) {
+    public ItemFragment(String url, ImageLoader imageLoader, boolean autoplayEnabled) {
         this.url = url;
         this.imageLoader = imageLoader;
+        this.autoplayEnabled = autoplayEnabled;
     }
 
     @Override
@@ -52,8 +55,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
         if (isAGif(url)) {
             ImageView ivPlay = rootView.findViewById(R.id.iv_play);
-            ivPlay.setVisibility(View.VISIBLE);
-            ivPlay.setOnClickListener(this::onPlay);
+            if (autoplayEnabled) {
+                onPlay(ivPlay);
+            } else {
+                ivPlay.setVisibility(View.VISIBLE);
+                ivPlay.setOnClickListener(this::onPlay);
+            }
         }
 
         return rootView;
@@ -77,7 +84,6 @@ public void onPageStarted(WebView view, String url, Bitmap favicon) {
 
         webView.getSettings().setLayoutAlgorithm(WebSettings.LayoutAlgorithm.SINGLE_COLUMN);
 
-
         webView.setBackgroundResource(android.R.color.transparent);
         rootView.findViewById(R.id.ll_gallery_item).setVisibility(View.VISIBLE);
         String html = String.format(HTML, url);
@@ -95,4 +101,4 @@ private void loadItem(NetworkImageView nivItem) {
 
     }
 
-}
+}

app/src/main/java/io/github/chiver/MainActivity.java

@@ -77,6 +77,7 @@ public void onRefresh() {
     @Override
     protected void _onCreateOptionsMenu(Menu menu) {
         menu.findItem(R.id.mi_refresh).setVisible(true);
+        menu.findItem(R.id.mi_autoplay).setVisible(false);
         menu.findItem(R.id.mi_share).setVisible(false);
         menu.findItem(R.id.mi_browse).setVisible(false);
     }

app/src/main/java/io/github/chiver/OSSActivity.java

@@ -92,6 +92,7 @@ private boolean isNotBlank(String s) {
     @Override
     protected void _onCreateOptionsMenu(Menu menu) {
         menu.findItem(R.id.mi_refresh).setVisible(false);
+        menu.findItem(R.id.mi_autoplay).setVisible(false);
         menu.findItem(R.id.mi_share).setVisible(false);
         menu.findItem(R.id.mi_browse).setVisible(false);
     }

app/src/main/res/drawable-anydpi/ic_disable_autoplay.xml

@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF"
+    android:alpha="0.8">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M22,12c0,5.52 -4.48,10 -10,10S2,17.52 2,12c0,-1.19 0.22,-2.32 0.6,-3.38L4.48,9.3C4.17,10.14 4,11.05 4,12c0,4.41 3.59,8 8,8s8,-3.59 8,-8s-3.59,-8 -8,-8c-0.95,0 -1.85,0.17 -2.69,0.48L8.63,2.59C9.69,2.22 10.82,2 12,2C17.52,2 22,6.48 22,12zM5.5,4C4.67,4 4,4.67 4,5.5S4.67,7 5.5,7S7,6.33 7,5.5S6.33,4 5.5,4zM11,16V8H9v8H11zM15,16V8h-2v8H15z"/>
+</vector>