Implement save, share image from archive

app/src/main/java/com/hippo/Native.java

@@ -18,8 +18,12 @@
 
 package com.hippo;
 
+import java.io.FileDescriptor;
+
 public class Native {
     public static void initialize() {
         System.loadLibrary("ehviewer");
     }
+
+    public static native int getFd(FileDescriptor fd);
 }

app/src/main/java/com/hippo/UriArchiveAccessor.java

@@ -21,10 +21,6 @@ package com.hippo;
 import android.content.Context;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
-import android.system.Os;
-import android.system.OsConstants;
-
-import java.io.FileDescriptor;
 
 public class UriArchiveAccessor {
     ParcelFileDescriptor pfd;
@@ -43,7 +39,11 @@ public class UriArchiveAccessor {
 
     private native int openArchive(int fd, long size);
 
-    public native long extracttoOutputStream(int index);
+    public native long extractToAddr(int index);
+
+    public native void extractToFd(int index, int fd);
+
+    public native String getFilename(int index);
 
     public native boolean needPassword();
 

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

@@ -24,15 +24,19 @@ import android.os.Process;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
+import com.hippo.Native;
 import com.hippo.UriArchiveAccessor;
 import com.hippo.ehviewer.GetText;
 import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.Settings;
 import com.hippo.image.Image;
 import com.hippo.unifile.UniFile;
+import com.hippo.yorozuya.FileUtils;
 import com.hippo.yorozuya.thread.PVLock;
 import com.hippo.yorozuya.thread.PriorityThread;
 
+import java.io.FileOutputStream;
+import java.io.IOException;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.Map;
@@ -143,28 +147,43 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
     @NonNull
     @Override
     public String getImageFilename(int index) {
-        // TODO
-        return Integer.toString(index);
-    }
-
-    @Override
-    public boolean save(int index, @NonNull UniFile file) {
-        // TODO
-        return false;
-    }
-
-    @Nullable
-    @Override
-    public UniFile save(int index, @NonNull UniFile dir, @NonNull String filename) {
-        // TODO
-        return null;
+        return FileUtils.getNameFromFilename(getImageFilenameWithExtension(index));
     }
 
     @NonNull
     @Override
     public String getImageFilenameWithExtension(int index) {
-        // TODO
-        return Integer.toString(index);
+        return FileUtils.sanitizeFilename(archiveAccessor.getFilename(index));
+    }
+
+    @Override
+    public boolean save(int index, @NonNull UniFile file) {
+        int fd;
+        FileOutputStream stream;
+        try {
+            stream = (FileOutputStream)file.openOutputStream();
+            fd = Native.getFd(stream.getFD());
+        } catch (IOException e) {
+            e.printStackTrace();
+            return false;
+        }
+        archiveAccessor.extractToFd(index, fd);
+        try {
+            stream.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return false;
+        }
+        return true;
+    }
+
+    @Nullable
+    @Override
+    public UniFile save(int index, @NonNull UniFile dir, @NonNull String filename) {
+        String extension = FileUtils.getExtensionFromFilename(getImageFilenameWithExtension(index));
+        UniFile dst = dir.subFile(null != extension ? filename + "." + extension : filename);
+        save(index, dst);
+        return dst;
     }
 
     private class ArchiveHostTask implements Runnable {
@@ -279,7 +298,7 @@ public class ArchiveGalleryProvider extends GalleryProvider2 {
                     }
                 }
 
-                long addr = archiveAccessor.extracttoOutputStream(index);
+                long addr = archiveAccessor.extractToAddr(index);
 
                 synchronized (streams) {
                     streams.put(index, addr);

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

@@ -858,7 +858,8 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
         intent.setAction(Intent.ACTION_SEND);
         intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
         intent.putExtra(Intent.EXTRA_STREAM, uri);
-        intent.putExtra(Intent.EXTRA_TEXT, EhUrl.getGalleryDetailUrl(mGalleryInfo.gid, mGalleryInfo.token));
+        if (mGalleryInfo != null)
+            intent.putExtra(Intent.EXTRA_TEXT, EhUrl.getGalleryDetailUrl(mGalleryInfo.gid, mGalleryInfo.token));
         intent.setDataAndType(uri, mimeType);
 
         try {

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

@@ -20,6 +20,8 @@ import android.graphics.Bitmap;
 
 import androidx.annotation.Nullable;
 
+import com.hippo.Native;
+
 import java.io.FileDescriptor;
 import java.util.ArrayList;
 
@@ -64,7 +66,7 @@ public final class Image {
      */
     @Nullable
     public static Image decode(FileDescriptor fd, boolean partially) {
-        return newFromAddr(nativeDecode(fd));
+        return newFromAddr(nativeDecode(Native.getFd(fd)));
     }
 
     /**
@@ -72,7 +74,7 @@ public final class Image {
      */
     @Nullable
     public static Image decode(Integer fd, boolean partially) {
-        return newFromAddr(nativeDecodeFdInt(fd));
+        return newFromAddr(nativeDecode(fd));
     }
 
     /**
@@ -99,9 +101,7 @@ public final class Image {
         return imageList.size();
     }
 
-    private static native long nativeDecode(FileDescriptor fd);
-
-    private static native long nativeDecodeFdInt(int fd);
+    private static native long nativeDecode(int fd);
 
     private static native long nativeDecodeAddr(long addr);