1.8.0.2

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

app/build.gradle

@@ -34,8 +34,8 @@ android {
         applicationId "moe.tarsin.ehviewer"
         minSdkVersion 31
         targetSdkVersion 33
-        versionCode 180001
-        versionName "1.8.0.1"
+        versionCode 180002
+        versionName "1.8.0.2"
         resConfigs 'zh', 'zh-rCN', 'zh-rHK', 'zh-rTW', 'es', 'ja', 'ko', 'fr', 'de', 'th'
     }
 
@@ -107,7 +107,7 @@ dependencies {
     implementation "androidx.biometric:biometric-ktx:1.2.0-alpha04"
     implementation "androidx.browser:browser:1.4.0"
 
-    def collection_version = "1.3.0-alpha01"
+    def collection_version = "1.3.0-alpha02"
     implementation "androidx.collection:collection:$collection_version"
     implementation "androidx.collection:collection-ktx:$collection_version"
 
@@ -122,7 +122,7 @@ dependencies {
     implementation "androidx.documentfile:documentfile:1.1.0-alpha01"
     implementation "androidx.dynamicanimation:dynamicanimation:1.1.0-alpha03"
 
-    def fragment_version = "1.5.0"
+    def fragment_version = "1.5.1"
     implementation "androidx.fragment:fragment:$fragment_version"
     implementation "androidx.fragment:fragment-ktx:$fragment_version"
 
@@ -148,7 +148,6 @@ dependencies {
 
     implementation 'com.drakeet.drawer:drawer:1.0.3'
     implementation 'com.google.android.material:material:1.7.0-alpha03'
-    implementation 'com.getkeepsafe.taptargetview:taptargetview:1.13.3'
     implementation 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:1.0.0'
     implementation 'com.squareup.okhttp3:okhttp:5.0.0-alpha.10'
     implementation 'dev.rikka.rikkax.core:core-ktx:1.4.1'

app/src/main/AndroidManifest.xml

@@ -26,11 +26,12 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-  
+
     <!-- Required to maintain app compatibility. -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
-                     android:maxSdkVersion="32" />
-  
+    <uses-permission
+        android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+
     <uses-feature
         android:glEsVersion="0x00020000"
         android:required="true" />

app/src/main/java/com/hippo/beerbelly/DiskLruCache.java

@@ -167,6 +167,7 @@ public final class DiskLruCache implements Closeable {
      * its sequence number is not equal to its entry's sequence number.
      */
     private long nextSequenceNumber = 0;
+
     private DiskLruCache(File directory, int appVersion, int valueCount, long maxSize) {
         this.directory = directory;
         this.appVersion = appVersion;
@@ -175,21 +176,7 @@ public final class DiskLruCache implements Closeable {
         this.journalFileBackup = new File(directory, JOURNAL_FILE_BACKUP);
         this.valueCount = valueCount;
         this.maxSize = maxSize;
-    }    private final Callable<Void> cleanupCallable = new Callable<>() {
-        public Void call() throws Exception {
-            synchronized (DiskLruCache.this) {
-                if (journalWriter == null) {
-                    return null; // Closed.
-                }
-                trimToSize();
-                if (journalRebuildRequired()) {
-                    rebuildJournal();
-                    redundantOpCount = 0;
-                }
-            }
-            return null;
-        }
-    };
+    }
 
     /**
      * Opens the cache in {@code directory}, creating a cache if none exists
@@ -244,7 +231,21 @@ public final class DiskLruCache implements Closeable {
         cache = new DiskLruCache(directory, appVersion, valueCount, maxSize);
         cache.rebuildJournal();
         return cache;
-    }
+    }    private final Callable<Void> cleanupCallable = new Callable<>() {
+        public Void call() throws Exception {
+            synchronized (DiskLruCache.this) {
+                if (journalWriter == null) {
+                    return null; // Closed.
+                }
+                trimToSize();
+                if (journalRebuildRequired()) {
+                    rebuildJournal();
+                    redundantOpCount = 0;
+                }
+            }
+            return null;
+        }
+    };
 
     private static void deleteIfExists(File file) throws IOException {
         if (file.exists() && !file.delete()) {

app/src/main/java/com/hippo/ehviewer/ImageBitmapHelper.java

@@ -16,8 +16,6 @@
 
 package com.hippo.ehviewer;
 
-import android.os.ParcelFileDescriptor;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
@@ -27,7 +25,6 @@ import com.hippo.streampipe.InputStreamPipe;
 
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.io.InputStream;
 
 public class ImageBitmapHelper implements ValueHelper<ImageBitmap> {
 

app/src/main/java/com/hippo/ehviewer/gallery/ArchiveGalleryProvider.java

@@ -34,10 +34,6 @@ import com.hippo.unifile.UniFile;
 import com.hippo.yorozuya.thread.PVLock;
 import com.hippo.yorozuya.thread.PriorityThread;
 
-import java.io.FileDescriptor;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;

app/src/main/java/com/hippo/ehviewer/gallery/DirGalleryProvider.java

@@ -259,7 +259,7 @@ public class DirGalleryProvider extends GalleryProvider2 implements Runnable {
             InputStream is = null;
             try {
                 is = files[index].openInputStream();
-                Image image = Image.decode(((FileInputStream)is).getFD(), true);
+                Image image = Image.decode(((FileInputStream) is).getFD(), true);
                 mDecodingIndex.lazySet(GalleryPageView.INVALID_INDEX);
                 if (image != null) {
                     notifyPageSucceed(index, image);

app/src/main/java/com/hippo/ehviewer/preference/VersionPreference.kt

@@ -50,7 +50,7 @@ class VersionPreference @JvmOverloads constructor(
 
     inner class NativeLibInfo {
         private var message: String = ""
-        fun addLib(libname:String, libversion:String): NativeLibInfo {
+        fun addLib(libname: String, libversion: String): NativeLibInfo {
             message = "$message$libname $libversion\n"
             return this
         }

app/src/main/java/com/hippo/ehviewer/spider/SpiderQueen.java

@@ -1678,10 +1678,9 @@ public final class SpiderQueen implements Runnable {
 
                 if (is != null) {
                     try {
-                        image = Image.decode(((FileInputStream)is).getFD(), true);
+                        image = Image.decode(((FileInputStream) is).getFD(), true);
                     } catch (IOException e) {
                         e.printStackTrace();
-                        image = null;
                     } finally {
                         try {
                             is.close();

app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java

@@ -226,6 +226,9 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
     private int mSize;
     private int mCurrentIndex;
     private int mSavingPage = -1;
+    private EditTextDialogBuilder builder;
+    private boolean dialogShown = false;
+    private AlertDialog dialog;
 
     private void buildProvider() {
         if (mGalleryProvider != null) {
@@ -287,7 +290,16 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
         }
         outState.putInt(KEY_PAGE, mPage);
         outState.putInt(KEY_CURRENT_INDEX, mCurrentIndex);
-    }
+    }    ActivityResultLauncher<String> requestStoragePermissionLauncher = registerForActivityResult(
+            new ActivityResultContracts.RequestPermission(),
+            result -> {
+                if (result && mSavingPage != -1) {
+                    saveImage(mSavingPage);
+                } else {
+                    Toast.makeText(this, R.string.error_cant_save_image, Toast.LENGTH_SHORT).show();
+                }
+                mSavingPage = -1;
+            });
 
     @Override
     protected void attachBaseContext(@NonNull Context newBase) {
@@ -477,16 +489,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
             FrameLayout mainLayout = (FrameLayout) ViewUtils.$$(this, R.id.main);
             mainLayout.addView(new GalleryGuideView(this));
         }
-    }    ActivityResultLauncher<String> requestStoragePermissionLauncher = registerForActivityResult(
-            new ActivityResultContracts.RequestPermission(),
-            result -> {
-                if (result && mSavingPage != -1) {
-                    saveImage(mSavingPage);
-                } else {
-                    Toast.makeText(this, R.string.error_cant_save_image, Toast.LENGTH_SHORT).show();
-                }
-                mSavingPage = -1;
-            });
+    }
 
     @Override
     protected void onDestroy() {
@@ -1046,6 +1049,66 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
         }
     }
 
+    private void showPasswdDialog() {
+        if (!dialogShown) {
+            dialogShown = true;
+            dialog.show();
+            if (dialog.getButton(AlertDialog.BUTTON_POSITIVE) != null) {
+                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(v -> {
+                    GalleryActivity.this.onProvidePasswd();
+                });
+            }
+            dialog.setOnCancelListener(v -> finish());
+        }
+    }
+
+    private void onProvidePasswd() {
+        String passwd = builder.getText();
+        if (passwd.isEmpty())
+            builder.setError(getString(R.string.passwd_cannot_be_empty));
+        else {
+            ArchiveGalleryProvider.passwd = passwd;
+            ArchiveGalleryProvider.pv.v();
+        }
+    }
+
+    private void onPasswdWrong() {
+        builder.setError(getString(R.string.passwd_wrong));
+    }
+
+    private void onPasswdCorrect() {
+        dialog.dismiss();
+    }
+
+    private static class ShowPasswdDialogHandler extends Handler {
+
+        //弱引用持有HandlerActivity , GC 回收时会被回收掉
+        private final WeakReference<GalleryActivity> weakReference;
+
+        public ShowPasswdDialogHandler(GalleryActivity activity) {
+            this.weakReference = new WeakReference(activity);
+        }
+
+        @Override
+        public void handleMessage(Message msg) {
+            GalleryActivity activity = weakReference.get();
+            super.handleMessage(msg);
+            if (null != activity) {
+                switch (msg.what) {
+                    case 0:
+                        activity.showPasswdDialog();
+                        break;
+                    case 1:
+                        activity.onPasswdWrong();
+                        break;
+                    case 2:
+                        activity.onPasswdCorrect();
+                        break;
+                }
+            }
+        }
+    }
+
     private class GalleryMenuHelper implements DialogInterface.OnClickListener {
 
         private final View mView;
@@ -1306,69 +1369,5 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
         }
     }
 
-    private EditTextDialogBuilder builder;
 
-    private boolean dialogShown = false;
-
-    private AlertDialog dialog;
-
-    private void showPasswdDialog() {
-        if (!dialogShown) {
-            dialogShown = true;
-            dialog.show();
-            if (dialog.getButton(AlertDialog.BUTTON_POSITIVE) != null) {
-                dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(v -> {
-                    GalleryActivity.this.onProvidePasswd();
-                });
-            }
-            dialog.setOnCancelListener(v -> finish());
-        }
-    }
-
-    private void onProvidePasswd() {
-        String passwd = builder.getText();
-        if (passwd.isEmpty())
-            builder.setError(getString(R.string.passwd_cannot_be_empty));
-        else {
-            ArchiveGalleryProvider.passwd = passwd;
-            ArchiveGalleryProvider.pv.v();
-        }
-    }
-
-    private void onPasswdWrong() {
-        builder.setError(getString(R.string.passwd_wrong));
-    }
-
-    private void onPasswdCorrect() {
-        dialog.dismiss();
-    }
-
-    private static class ShowPasswdDialogHandler extends Handler {
-
-        //弱引用持有HandlerActivity , GC 回收时会被回收掉
-        private final WeakReference<GalleryActivity> weakReference;
-
-        public ShowPasswdDialogHandler(GalleryActivity activity) {
-            this.weakReference = new WeakReference(activity);
-        }
-
-        @Override
-        public void handleMessage(Message msg) {
-            GalleryActivity activity = weakReference.get();
-            super.handleMessage(msg);
-            if (null != activity) {
-                switch (msg.what) {
-                    case 0:
-                        activity.showPasswdDialog();
-                        break;
-                    case 1:
-                        activity.onPasswdWrong();
-                        break;
-                    case 2:
-                        activity.onPasswdCorrect();
-                        break;
-                }
-            }
-        }
-    }
 }

app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.java

@@ -22,7 +22,6 @@ import android.content.res.Resources;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
-import android.provider.Settings;
 
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;

app/src/main/java/com/hippo/ehviewer/ui/scene/DownloadsScene.java

@@ -55,8 +55,6 @@ import androidx.recyclerview.widget.RecyclerView;
 import androidx.recyclerview.widget.SimpleItemAnimator;
 import androidx.recyclerview.widget.StaggeredGridLayoutManager;
 
-import com.getkeepsafe.taptargetview.TapTarget;
-import com.getkeepsafe.taptargetview.TapTargetView;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.h6ah4i.android.widget.advrecyclerview.animator.DraggableItemAnimator;
@@ -390,90 +388,9 @@ public class DownloadsScene extends ToolbarScene
 
         updateView();
 
-        guide();
-
         return view;
     }
 
-    private void guide() {
-        if (Settings.getGuideDownloadThumb() && null != mRecyclerView) {
-            mRecyclerView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-                @Override
-                public void onGlobalLayout() {
-                    if (Settings.getGuideDownloadThumb()) {
-                        guideDownloadThumb();
-                    }
-                    if (null != mRecyclerView) {
-                        ViewUtils.removeOnGlobalLayoutListener(mRecyclerView.getViewTreeObserver(), this);
-                    }
-                }
-            });
-        } else {
-            guideDownloadLabels();
-        }
-    }
-
-    private void guideDownloadThumb() {
-        MainActivity activity = getMainActivity();
-        if (null == activity || !Settings.getGuideDownloadThumb() || null == mLayoutManager || null == mRecyclerView) {
-            guideDownloadLabels();
-            return;
-        }
-        int position = mLayoutManager.findFirstCompletelyVisibleItemPositions(null)[0];
-        if (position < 0) {
-            guideDownloadLabels();
-            return;
-        }
-        RecyclerView.ViewHolder holder = mRecyclerView.findViewHolderForAdapterPosition(position);
-        if (null == holder) {
-            guideDownloadLabels();
-            return;
-        }
-
-        TapTargetView.showFor(requireActivity(),
-                TapTarget.forView(((DownloadHolder) holder).thumb,
-                                getString(R.string.guide_download_thumb_title),
-                                getString(R.string.guide_download_thumb_text))
-                        .transparentTarget(true),
-                new TapTargetView.Listener() {
-                    @Override
-                    public void onTargetDismissed(TapTargetView view, boolean userInitiated) {
-                        super.onTargetDismissed(view, userInitiated);
-                        Settings.putGuideDownloadThumb(false);
-                        guideDownloadLabels();
-                    }
-                });
-    }
-
-    private void guideDownloadLabels() {
-        MainActivity activity = getMainActivity();
-        if (null == activity || !Settings.getGuideDownloadLabels()) {
-            return;
-        }
-
-        Display display = activity.getWindowManager().getDefaultDisplay();
-        Point point = new Point();
-        display.getSize(point);
-        Rect bounds = new Rect(point.x + LayoutUtils.dp2pix(requireContext(), 20),
-                point.y / 3 + LayoutUtils.dp2pix(requireContext(), 20),
-                point.x - LayoutUtils.dp2pix(requireContext(), 20),
-                point.y / 3 - LayoutUtils.dp2pix(requireContext(), 20));
-
-        TapTargetView.showFor(requireActivity(),
-                TapTarget.forBounds(bounds,
-                                getString(R.string.guide_download_labels_title),
-                                getString(R.string.guide_download_labels_text))
-                        .transparentTarget(true),
-                new TapTargetView.Listener() {
-                    @Override
-                    public void onTargetDismissed(TapTargetView view, boolean userInitiated) {
-                        super.onTargetClick(view);
-                        Settings.puttGuideDownloadLabels(false);
-                        openDrawer(Gravity.RIGHT);
-                    }
-                });
-    }
-
     @Override
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);

app/src/main/java/com/hippo/ehviewer/ui/scene/FavoritesScene.java

@@ -45,8 +45,6 @@ import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.getkeepsafe.taptargetview.TapTarget;
-import com.getkeepsafe.taptargetview.TapTargetView;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.hippo.annotation.Implemented;
@@ -311,40 +309,9 @@ public class FavoritesScene extends BaseScene implements
             mHelper.firstRefresh();
         }
 
-        guideCollections();
-
         return view;
     }
 
-    private void guideCollections() {
-        Activity activity = getMainActivity();
-        if (null == activity || !Settings.getGuideCollections()) {
-            return;
-        }
-
-        Display display = activity.getWindowManager().getDefaultDisplay();
-        Point point = new Point();
-        display.getSize(point);
-        Rect bounds = new Rect(point.x + LayoutUtils.dp2pix(requireContext(), 20),
-                point.y / 3 + LayoutUtils.dp2pix(requireContext(), 20),
-                point.x - LayoutUtils.dp2pix(requireContext(), 20),
-                point.y / 3 - LayoutUtils.dp2pix(requireContext(), 20));
-
-        TapTargetView.showFor(requireActivity(),
-                TapTarget.forBounds(bounds,
-                                getString(R.string.guide_collections_title),
-                                getString(R.string.guide_collections_text))
-                        .transparentTarget(true),
-                new TapTargetView.Listener() {
-                    @Override
-                    public void onTargetDismissed(TapTargetView view, boolean userInitiated) {
-                        super.onTargetClick(view);
-                        Settings.putGuideCollections(false);
-                        openDrawer(Gravity.RIGHT);
-                    }
-                });
-    }
-
     // keyword of mUrlBuilder, fav cat of mUrlBuilder, mFavCatArray.
     // They changed, call it
     private void updateSearchBar() {

app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryListScene.java

@@ -59,8 +59,6 @@ import androidx.drawerlayout.widget.DrawerLayout;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.getkeepsafe.taptargetview.TapTarget;
-import com.getkeepsafe.taptargetview.TapTargetView;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.h6ah4i.android.widget.advrecyclerview.animator.DraggableItemAnimator;
@@ -634,40 +632,9 @@ public final class GalleryListScene extends BaseScene
             mHelper.firstRefresh();
         }
 
-        guideQuickSearch();
-
         return view;
     }
 
-    private void guideQuickSearch() {
-        Activity activity = getMainActivity();
-        if (null == activity || !Settings.getGuideQuickSearch()) {
-            return;
-        }
-
-        Display display = activity.getWindowManager().getDefaultDisplay();
-        Point point = new Point();
-        display.getSize(point);
-        Rect bounds = new Rect(point.x + LayoutUtils.dp2pix(requireContext(), 20),
-                point.y / 3 + LayoutUtils.dp2pix(requireContext(), 20),
-                point.x - LayoutUtils.dp2pix(requireContext(), 20),
-                point.y / 3 - LayoutUtils.dp2pix(requireContext(), 20));
-
-        TapTargetView.showFor(requireActivity(),
-                TapTarget.forBounds(bounds,
-                                getString(R.string.guide_quick_search_title),
-                                getString(R.string.guide_quick_search_text))
-                        .transparentTarget(true),
-                new TapTargetView.Listener() {
-                    @Override
-                    public void onTargetDismissed(TapTargetView view, boolean userInitiated) {
-                        super.onTargetClick(view);
-                        Settings.putGuideQuickSearch(false);
-                        openDrawer(Gravity.RIGHT);
-                    }
-                });
-    }
-
     @Override
     public void onDestroyView() {
         super.onDestroyView();

app/src/main/java/com/hippo/glgallery/GalleryProvider.java

@@ -57,6 +57,7 @@ public abstract class GalleryProvider {
     public void stop() {
         OSUtils.checkMainLoop();
         mImageCache.evictAll();
+        Image.lazyEvictAll();
     }
 
     public void setGLRoot(GLRoot glRoot) {
@@ -245,18 +246,14 @@ public abstract class GalleryProvider {
         }
 
         public void add(Integer key, ImageWrapper value) {
-            if (value.getFormat() != Image.FORMAT_ANIMATED && value.obtain()) {
-                put(key, value);
-            }
+            if (value.getFormat() != Image.FORMAT_ANIMATED)
+                if (value.obtain())
+                    put(key, value);
         }
 
         @Override
         protected int sizeOf(Integer key, ImageWrapper value) {
-            int size = value.getWidth() * value.getHeight() * 4;
-            if (value.getFormat() == Image.FORMAT_ANIMATED) {
-                size *= 5;
-            }
-            return size;
+            return value.getWidth() * value.getHeight() * 4;
         }
 
         @Override

app/src/main/java/com/hippo/unifile/DocumentsContractApi21.java

@@ -33,6 +33,7 @@ final class DocumentsContractApi21 {
     private static final String TAG = DocumentsContractApi21.class.getSimpleName();
     private static final String PATH_DOCUMENT = "document";
     private static final String PATH_TREE = "tree";
+
     private DocumentsContractApi21() {
     }
 

app/src/main/java/com/hippo/unifile/FileDescriptorRandomAccessFile.java

@@ -41,6 +41,7 @@ class FileDescriptorRandomAccessFile implements UniRandomAccessFile {
     private final int flushAfterWrite;
     private final Object closeLock = new Object();
     private volatile boolean closed = false;
+
     private FileDescriptorRandomAccessFile(ParcelFileDescriptor pfd, FileDescriptor fd, String mode) {
         this.pfd = pfd;
         this.fd = fd;

app/src/main/java/com/hippo/widget/BatteryView.java

@@ -82,6 +82,13 @@ public class BatteryView extends AppCompatTextView {
         }
         mCurrentColor = color;
         super.setTextColor(color);
+    }
+
+    private void startCharger() {
+        if (!mIsChargerWorking) {
+            getHandler().post(mCharger);
+            mIsChargerWorking = true;
+        }
     }    private final Runnable mCharger = new Runnable() {
 
         private int level = 0;
@@ -97,13 +104,6 @@ public class BatteryView extends AppCompatTextView {
         }
     };
 
-    private void startCharger() {
-        if (!mIsChargerWorking) {
-            getHandler().post(mCharger);
-            mIsChargerWorking = true;
-        }
-    }
-
     private void stopCharger() {
         if (mIsChargerWorking) {
             getHandler().removeCallbacks(mCharger);
@@ -145,6 +145,7 @@ public class BatteryView extends AppCompatTextView {
 
 
 
+
     private final BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
 
         @Override

app/src/main/java/com/hippo/widget/TextClock.java

@@ -97,6 +97,10 @@ public class TextClock extends AppCompatTextView {
         } else {
             mTime = Calendar.getInstance();
         }
+    }
+
+    public CharSequence getFormat12Hour() {
+        return mFormat12;
     }    private final Runnable mTicker = new Runnable() {
         @Override
         public void run() {
@@ -109,10 +113,6 @@ public class TextClock extends AppCompatTextView {
         }
     };
 
-    public CharSequence getFormat12Hour() {
-        return mFormat12;
-    }
-
     public void setFormat12Hour(CharSequence format) {
         mFormat12 = format;
 
@@ -144,19 +144,7 @@ public class TextClock extends AppCompatTextView {
 
         createTime(timeZone);
         onTimeChanged();
-    }    private final ContentObserver mFormatChangeObserver = new ContentObserver(new Handler()) {
-        @Override
-        public void onChange(boolean selfChange) {
-            chooseFormat();
-            onTimeChanged();
-        }
-
-        @Override
-        public void onChange(boolean selfChange, Uri uri) {
-            chooseFormat();
-            onTimeChanged();
-        }
-    };
+    }
 
     /**
      * Selects either one of {@link #getFormat12Hour()} or {@link #getFormat24Hour()}
@@ -170,7 +158,19 @@ public class TextClock extends AppCompatTextView {
 
     public CharSequence getFormat() {
         return mFormat;
-    }
+    }    private final ContentObserver mFormatChangeObserver = new ContentObserver(new Handler()) {
+        @Override
+        public void onChange(boolean selfChange) {
+            chooseFormat();
+            onTimeChanged();
+        }
+
+        @Override
+        public void onChange(boolean selfChange, Uri uri) {
+            chooseFormat();
+            onTimeChanged();
+        }
+    };
 
     /**
      * Selects either one of {@link #getFormat12Hour()} or {@link #getFormat24Hour()}

app/src/main/res/layout-television/gallery_detail_actions.xml

@@ -84,10 +84,10 @@
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:paddingTop="8dp"
-                android:paddingBottom="8dp"
                 android:divider="@drawable/spacer_keyline"
                 android:orientation="horizontal"
+                android:paddingTop="8dp"
+                android:paddingBottom="8dp"
                 android:showDividers="middle">
 
                 <FrameLayout

app/src/main/res/layout-television/gallery_detail_header.xml

@@ -230,8 +230,8 @@
                     android:clickable="true"
                     android:focusable="true"
                     android:insetLeft="40dp"
-                    android:insetRight="40dp"
                     android:insetTop="16dp"
+                    android:insetRight="40dp"
                     android:text="@string/read">
 
                     <requestFocus />
@@ -244,11 +244,11 @@
                     android:layout_height="wrap_content"
                     android:layout_weight="1"
                     android:clickable="true"
-                    android:nextFocusDown="@+id/torrent"
                     android:focusable="true"
                     android:insetLeft="40dp"
                     android:insetTop="16dp"
-                    android:insetRight="40dp" />
+                    android:insetRight="40dp"
+                    android:nextFocusDown="@+id/torrent" />
 
 
                 <android.widget.Space

app/src/main/res/layout/gallery_detail_header.xml

@@ -188,11 +188,11 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="@dimen/keyline_margin"
-                    app:chipSpacingHorizontal="8dp"
                     android:ellipsize="end"
                     android:singleLine="true"
                     android:textAllCaps="true"
                     app:chipIcon="@drawable/ic_baseline_label_24"
+                    app:chipSpacingHorizontal="8dp"
                     app:ensureMinTouchTargetSize="true"
                     app:layout_constraintBottom_toTopOf="@id/uploader"
                     app:layout_constraintEnd_toEndOf="parent" />

native/src/main/java/com/hippo/image/Image.java

@@ -17,11 +17,12 @@
 package com.hippo.image;
 
 import android.graphics.Bitmap;
+import android.util.Log;
 
 import androidx.annotation.Nullable;
 
 import java.io.FileDescriptor;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.ArrayList;
 
 /**
  * The {@code Image} is a image which stored pixel data in native heap
@@ -31,7 +32,9 @@ public final class Image {
 
     public static final int FORMAT_ANIMATED = 1;
 
-    private static final AtomicInteger sImageCount = new AtomicInteger();
+    private static final ArrayList<Image> imageList = new ArrayList<>();
+    private static boolean needEvictAll = false;
+
     private final int mFormat;
     private final int mWidth;
     private final int mHeight;
@@ -39,12 +42,27 @@ public final class Image {
     private Throwable mRecycleTracker;
 
     private Image(long nativePtr, int format, int width, int height) {
+        if (needEvictAll)
+            evictAll();
         mNativePtr = nativePtr;
         mFormat = format;
         mWidth = width;
         mHeight = height;
 
-        sImageCount.getAndIncrement();
+        imageList.add(this);
+    }
+
+    public static void lazyEvictAll() {
+        needEvictAll = true;
+    }
+
+    private static void evictAll() {
+        for (Image image : imageList) {
+            nativeRecycle(image.mNativePtr);
+            image.mNativePtr = 0;
+        }
+        imageList.clear();
+        needEvictAll = false;
     }
 
     /**
@@ -84,7 +102,7 @@ public final class Image {
      * It is useful for debug.
      */
     public static int getImageCount() {
-        return sImageCount.get();
+        return imageList.size();
     }
 
     private static native Image nativeDecode(FileDescriptor fd);
@@ -194,7 +212,7 @@ public final class Image {
             nativeRecycle(mNativePtr);
             mNativePtr = 0;
 
-            sImageCount.getAndDecrement();
+            imageList.remove(this);
 
             mRecycleTracker = new Throwable("It's a ImageRecycleTracker");
         }

native/src/main/jni/archive.c

@@ -43,7 +43,7 @@ static char *passwd = NULL;
 static void *archiveAddr = NULL;
 static jlong archiveSize = 0;
 
-const char supportExt[9][6]  = {
+const char supportExt[9][6] = {
         "jpeg",
         "jpg",
         "png",
@@ -60,7 +60,7 @@ static int filename_is_playable_file(const char *name) {
     if (!dotptr++)
         return false;
     int i;
-    for (i=0; i<9; i++)
+    for (i = 0; i < 9; i++)
         if (strcmp(dotptr, supportExt[i]) == 0)
             return true;
     return false;
@@ -117,7 +117,6 @@ Java_com_hippo_UriArchiveAccessor_openArchive(JNIEnv *_, jobject thiz, jlong add
                 need_encrypt = true;
                 break;
             case 0: // format supports but no encrypted entry found
-            case ARCHIVE_READ_FORMAT_ENCRYPTION_DONT_KNOW: // Sometimes we might not read through whole file|vm, but it means so far we haven't meet any encrypted entry yet
             default:
                 need_encrypt = false;
         }
@@ -128,7 +127,7 @@ Java_com_hippo_UriArchiveAccessor_openArchive(JNIEnv *_, jobject thiz, jlong add
 }
 
 typedef struct Memarea {
-    void* buffer;
+    void *buffer;
     long size;
 } Memarea;
 
@@ -140,20 +139,18 @@ Java_com_hippo_UriArchiveAccessor_extracttoOutputStream(JNIEnv *_, jobject thiz,
         archive_alloc();
         cur_index = 0;
     }
-    Memarea* memarea = malloc(sizeof(Memarea));
+    Memarea *memarea = malloc(sizeof(Memarea));
     while (archive_read_next_header(arc, &entry) == ARCHIVE_OK) {
         if (!filename_is_playable_file(archive_entry_pathname(entry)))
             continue;
         if (cur_index++ == index) {
             memarea->size = archive_entry_size(entry);
             memarea->buffer = malloc(memarea->size);
-            for (;;) {
-                ret = archive_read_data(arc, memarea->buffer, memarea->size);
-                if (ret < 0) {
-                    LOGE("%s%s", "Archive read failed:", archive_error_string(arc));
-                }
-                break;
-            }
+            ret = archive_read_data(arc, memarea->buffer, memarea->size);
+            if (ret != memarea->size)
+                LOGE("%s", "No enough data read, WTF?");
+            if (ret < 0)
+                LOGE("%s%s", "Archive read failed:", archive_error_string(arc));
             break;
         }
     }
@@ -180,7 +177,6 @@ Java_com_hippo_UriArchiveAccessor_providePassword(JNIEnv *_, jobject thiz, jstri
         free(passwd);
     passwd = calloc(len, sizeof(char));
     strcpy(passwd, (*env)->GetStringUTFChars(env, str, NULL));
-    LOGI("%s%s", "Passwd is ", passwd);
     archive_alloc();
     while (archive_read_next_header(arc, &entry) == ARCHIVE_OK) {
         if (!filename_is_playable_file(archive_entry_pathname(entry)))

native/src/main/jni/image/image.c

@@ -1,17 +1,20 @@
 /*
- * Copyright 2015 Hippo Seven
+ * Copyright 2022 Tarsin Norbin
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This file is part of EhViewer
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * EhViewer is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * EhViewer is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * EhViewer. If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <android/data_space.h>
@@ -33,12 +36,14 @@ void decodeCommon(IMAGE *image, SOURCE *src) {
     image->alpha =
             AImageDecoderHeaderInfo_getAlphaFlags(headerInfo) == ANDROID_BITMAP_FLAGS_ALPHA_PREMUL;
     src->stride = AImageDecoder_getMinimumStride(decoder);
-    image->bufferLen = image->height * src->stride;
+    image->bufferLen = (int) (image->height * src->stride);
     image->buffer = malloc(image->bufferLen);
     if (image->isAnimated) {
         AImageDecoder_setInternallyHandleDisposePrevious(decoder, false);
-        src->frameInfo = AImageDecoderFrameInfo_create();
-        AImageDecoder_getFrameInfo(decoder, src->frameInfo);
+        AImageDecoderFrameInfo *frameInfo = AImageDecoderFrameInfo_create();
+        AImageDecoder_getFrameInfo(decoder, frameInfo);
+        image->delay = (int) AImageDecoderFrameInfo_getDuration(frameInfo) / 1000000;
+        AImageDecoderFrameInfo_delete(frameInfo);
     }
     AImageDecoder_decodeImage(decoder, image->buffer, src->stride, image->bufferLen);
     if (!image->isAnimated) {
@@ -47,7 +52,7 @@ void decodeCommon(IMAGE *image, SOURCE *src) {
     }
 }
 
-IMAGE *createFromFd(JNIEnv *env, int fd) {
+IMAGE *createFromFd(int fd) {
     AImageDecoder *decoder;
     AImageDecoder_createFromFd(fd, &decoder);
     IMAGE *image = calloc(1, sizeof(IMAGE));
@@ -58,7 +63,7 @@ IMAGE *createFromFd(JNIEnv *env, int fd) {
     return image;
 }
 
-IMAGE *createFromAddr(JNIEnv *env, void *addr, long size) {
+IMAGE *createFromAddr(void *addr, long size) {
     AImageDecoder *decoder;
     AImageDecoder_createFromBuffer((const void *) addr, size, &decoder);
     IMAGE *image = calloc(1, sizeof(IMAGE));
@@ -80,7 +85,7 @@ IMAGE *create(int32_t width, int32_t height, const void *data) {
     plain->width = width;
     plain->height = height;
     plain->buffer = buffer;
-    plain->bufferLen = length;
+    plain->bufferLen = (int) length;
 
     return plain;
 }
@@ -103,9 +108,3 @@ void advance(IMAGE *image) {
         }
     }
 }
-
-int get_delay(IMAGE *image) {
-    if (image->isAnimated)
-        return (int) AImageDecoderFrameInfo_getDuration(image->src->frameInfo) / 1000000;
-    return 0;
-}

native/src/main/jni/image/image.h

@@ -1,17 +1,20 @@
 /*
- * Copyright 2015 Hippo Seven
+ * Copyright 2022 Tarsin Norbin
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * This file is part of EhViewer
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * EhViewer is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * EhViewer is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * EhViewer. If not, see <https://www.gnu.org/licenses/>.
  */
 
 #ifndef IMAGE_IMAGE_H
@@ -19,15 +22,11 @@
 
 #include <android/imagedecoder.h>
 #include <stdbool.h>
-#include <jni.h>
-
-#include "log.h"
 
 typedef struct {
     AImageDecoder *decoder;
     void *srcBuffer;
     size_t stride;
-    AImageDecoderFrameInfo *frameInfo;
     int fd;
 } SOURCE;
 
@@ -38,13 +37,13 @@ typedef struct {
     int bufferLen;
     bool isAnimated;
     bool alpha;
+    int delay;
     SOURCE *src;
 } IMAGE;
 
 static void recycleSource(SOURCE *src) {
     if (!src)
         return;
-    AImageDecoderFrameInfo_delete(src->frameInfo);
     AImageDecoder_delete(src->decoder);
     free(src->srcBuffer);
     free(src);
@@ -58,9 +57,9 @@ static void recycle(IMAGE *image) {
     free(image);
 }
 
-IMAGE *createFromFd(JNIEnv *env, int fd);
+IMAGE *createFromFd(int fd);
 
-IMAGE *createFromAddr(JNIEnv *env, void *addr, long size);
+IMAGE *createFromAddr(void *addr, long size);
 
 IMAGE *create(int32_t width, int32_t height, const void *data);
 
@@ -70,6 +69,4 @@ void render(IMAGE *image, int src_x, int src_y,
 
 void advance(IMAGE *image);
 
-int get_delay(IMAGE *image);
-
-#endif //IMAGE_IMAGE_H
+#endif /* IMAGE_IMAGE_H */

native/src/main/jni/image/image_utils.h

@@ -26,10 +26,4 @@ bool copy_pixels(const void *src, int src_w, int src_h, int src_x, int src_y,
                  void *dst, int dst_w, int dst_h, int dst_x, int dst_y,
                  int width, int height);
 
-#define STRINGIZE(L) #L
-#define MAKESTRING(M, L) M(L)
-
-#define MIN(a, b) (((a) < (b)) ? (a) : (b))
-#define MAX(a, b) (((a) > (b)) ? (a) : (b))
-
-#endif //IMAGE_IMAGE_UTILS_H
+#endif /* IMAGE_IMAGE_UTILS_H */

native/src/main/jni/image/java_wrapper.c

@@ -17,15 +17,13 @@
 #include <stdlib.h>
 #include <android/bitmap.h>
 #include <GLES2/gl2.h>
+#include <jni.h>
 
 #include "java_wrapper.h"
 #include "image.h"
-#include "image_utils.h"
 #include "log.h"
 
-static JavaVM *jvm;
-
-static void *tile_buffer;
+static void *tile_buffer = NULL;
 
 static int jniGetFDFromFileDescriptor(JNIEnv *env, jobject fileDescriptor) {
     jint fd = -1;
@@ -41,54 +39,20 @@ static int jniGetFDFromFileDescriptor(JNIEnv *env, jobject fileDescriptor) {
     return fd;
 }
 
-JNIEnv *obtain_env(bool *attach) {
-    JNIEnv *env;
-    switch ((*jvm)->GetEnv(jvm, (void **) &env, JNI_VERSION_1_6)) {
-        case JNI_EDETACHED:
-            if ((*jvm)->AttachCurrentThread(jvm, &env, NULL) == JNI_OK) {
-                *attach = true;
-                return env;
-            } else {
-                return NULL;
-            }
-        case JNI_OK:
-            *attach = false;
-            return env;
-        default:
-        case JNI_EVERSION:
-            return NULL;
-    }
-}
-
-void release_env() {
-    (*jvm)->DetachCurrentThread(jvm);
-}
-
 jobject create_image_object(JNIEnv *env, void *ptr, int format, int width, int height) {
     jclass image_clazz;
     jmethodID constructor;
 
     image_clazz = (*env)->FindClass(env, "com/hippo/image/Image");
     constructor = (*env)->GetMethodID(env, image_clazz, "<init>", "(JIII)V");
-    if (constructor == 0) {
-        LOGE(MSG("Can't find Image object constructor"));
-        return NULL;
-    } else {
-        return (*env)->NewObject(env, image_clazz, constructor,
-                                 (jlong) (uintptr_t) ptr, (jint) format, (jint) width,
-                                 (jint) height);
-    }
+    return (*env)->NewObject(env, image_clazz, constructor,
+                             (jlong) (uintptr_t) ptr, (jint) format, (jint) width,
+                             (jint) height);
 }
 
 JNIEXPORT jobject JNICALL
 Java_com_hippo_image_Image_nativeDecodeFdInt(JNIEnv *env, jclass clazz, jint fd) {
-    IMAGE *image;
-
-    image = createFromFd(env, fd);
-    if (image == NULL) {
-        return NULL;
-    }
-
+    IMAGE *image = createFromFd(fd);
     return create_image_object(env, image, image->isAnimated, image->width, image->height);
 }
 
@@ -106,10 +70,6 @@ Java_com_hippo_image_Image_nativeCreate(JNIEnv *env, jclass clazz, jobject bitma
 
     AndroidBitmap_getInfo(env, bitmap, &info);
     AndroidBitmap_lockPixels(env, bitmap, &pixels);
-    if (pixels == NULL) {
-        LOGE(MSG("Can't lock bitmap pixels"));
-        return NULL;
-    }
 
     image = create(info.width, info.height, pixels);
     AndroidBitmap_unlockPixels(env, bitmap);
@@ -125,10 +85,6 @@ Java_com_hippo_image_Image_nativeRender(JNIEnv *env, jclass clazz, jlong ptr, ji
 
     AndroidBitmap_getInfo(env, dst, &info);
     AndroidBitmap_lockPixels(env, dst, &pixels);
-    if (pixels == NULL) {
-        LOGE(MSG("Can't lock bitmap pixels"));
-        return;
-    }
 
     render((IMAGE *) ptr, src_x, src_y, pixels, info.width, info.height, dst_x, dst_y, width,
            height);
@@ -160,7 +116,7 @@ Java_com_hippo_image_Image_nativeAdvance(JNIEnv *env, jclass clazz, jlong ptr) {
 
 JNIEXPORT jint JNICALL
 Java_com_hippo_image_Image_nativeGetDelay(JNIEnv *env, jclass clazz, jlong ptr) {
-    return get_delay((IMAGE *) ptr);
+    return ((IMAGE *) ptr)->delay;
 }
 
 JNIEXPORT jboolean JNICALL
@@ -173,14 +129,12 @@ Java_com_hippo_image_Image_nativeRecycle(JNIEnv *env, jclass clazz, jlong ptr) {
     recycle((IMAGE *) ptr);
 }
 
-bool image_onLoad(JavaVM *vm) {
-    jvm = vm;
+bool image_onLoad() {
     tile_buffer = malloc(IMAGE_TILE_MAX_SIZE * 4);
-    return true;
+    return tile_buffer != NULL;
 }
 
-JNIEXPORT void JNICALL
-JNI_OnUnload(JavaVM *vm, void *reserved) {
+void image_onUnload() {
     free(tile_buffer);
     tile_buffer = NULL;
 }
@@ -188,7 +142,7 @@ JNI_OnUnload(JavaVM *vm, void *reserved) {
 JNIEXPORT jobject JNICALL
 Java_com_hippo_image_Image_nativeDecodeAddr(JNIEnv *env, jclass clazz, jlong addr) {
     Memarea *memarea = (Memarea *) addr;
-    IMAGE *image = createFromAddr(env, memarea->buffer, memarea->size);
+    IMAGE *image = createFromAddr(memarea->buffer, memarea->size);
     free(memarea);
     return create_image_object(env, image, image->isAnimated, image->width, image->height);
 }

native/src/main/jni/image/java_wrapper.h

@@ -20,7 +20,6 @@
 #ifndef IMAGE_JAVA_WRAPPER_H
 #define IMAGE_JAVA_WRAPPER_H
 
-#include <jni.h>
 #include <stdbool.h>
 
 #define IMAGE_TILE_MAX_SIZE (512 * 512)
@@ -30,10 +29,8 @@ typedef struct Memarea {
     long size;
 } Memarea;
 
-bool image_onLoad(JavaVM *vm);
+bool image_onLoad();
 
-JNIEnv *obtain_env(bool *attach);
+void image_onUnload();
 
-void release_env();
-
-#endif // IMAGE_JAVA_WRAPPER_H
+#endif /* IMAGE_JAVA_WRAPPER_H */

native/src/main/jni/image/log.h

@@ -27,11 +27,4 @@
 #define LOGE(...) __android_log_print(ANDROID_LOG_ERROR, TAG ,__VA_ARGS__)
 #define LOGF(...) __android_log_print(ANDROID_LOG_FATAL, TAG ,__VA_ARGS__)
 
-#define FILE_LINE MAKESTRING(STRINGIZE, __LINE__ )
-#define MSG(msg) __FILE__ "(" FILE_LINE "): "msg
-
-#define OUT_OF_MEMORY "Out of memory"
-
-#define WTF_OM LOGE(MSG(OUT_OF_MEMORY))
-
-#endif //LOG_H
+#endif /* LOG_H */

native/src/main/jni/main.c

@@ -39,6 +39,11 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) {
     return JNI_VERSION_1_6;
 }
 
+JNIEXPORT void JNICALL
+JNI_OnUnload(JavaVM *vm, void *reserved) {
+    image_onUnload();
+}
+
 JNIEXPORT jstring JNICALL
 Java_com_hippo_Native_getlibarchiveVersion(JNIEnv *env, jclass clazz) {
     return (*env)->NewStringUTF(env, ARCHIVE_VERSION_STRING);

renovate.json

@@ -1,4 +1,9 @@
 {
+  "baseBranches": [
+    "1.8.x.x",
+    "1.7.x.x"
+  ],
+
   "extends": [
     "config:base"
   ]