From 680322d9165dd2a588a5f1648e5d4da1491858b3 Mon Sep 17 00:00:00 2001 From: Varun Patil Date: Mon, 13 Nov 2023 22:37:19 -0800 Subject: [PATCH] nx: support multi-share API --- .../src/main/java/gallery/memories/NativeX.kt | 13 ++-- .../memories/service/DownloadService.kt | 77 ++++++++++++------- 2 files changed, 56 insertions(+), 34 deletions(-) diff --git a/android/app/src/main/java/gallery/memories/NativeX.kt b/android/app/src/main/java/gallery/memories/NativeX.kt index 51366b6f..eaa4b4b7 100644 --- a/android/app/src/main/java/gallery/memories/NativeX.kt +++ b/android/app/src/main/java/gallery/memories/NativeX.kt @@ -55,8 +55,7 @@ class NativeX(private val mCtx: MainActivity) { val IMAGE_FULL = Regex("^/image/full/[0-9a-f]+$") val SHARE_URL = Regex("^/api/share/url/.+$") - val SHARE_BLOB = Regex("^/api/share/blob/.+$") - val SHARE_LOCAL = Regex("^/api/share/local/[0-9a-f]+$") + val SHARE_BLOB = Regex("^/api/share/blobs$") val CONFIG_ALLOW_MEDIA = Regex("^/api/config/allow_media/\\d+$") } @@ -113,6 +112,12 @@ class NativeX(private val mCtx: MainActivity) { dlService!!.queue(url, filename) } + @JavascriptInterface + fun setShareBlobs(objects: String?) { + if (objects == null) return; + dlService!!.setShareBlobs(JSONArray(objects)) + } + @JavascriptInterface fun playVideo(auid: String, fileid: Long, urlsArray: String) { mCtx.threadPool.submit { @@ -250,9 +255,7 @@ class NativeX(private val mCtx: MainActivity) { } else if (path.matches(API.SHARE_URL)) { makeResponse(dlService!!.shareUrl(URLDecoder.decode(parts[4], "UTF-8"))) } else if (path.matches(API.SHARE_BLOB)) { - makeResponse(dlService!!.shareBlobFromUrl(URLDecoder.decode(parts[4], "UTF-8"))) - } else if (path.matches(API.SHARE_LOCAL)) { - makeResponse(dlService!!.shareLocal(parts[4])) + makeResponse(dlService!!.shareBlobs()) } else if (path.matches(API.CONFIG_ALLOW_MEDIA)) { permissions.setAllowMedia(true) if (permissions.requestMediaPermissionSync()) { diff --git a/android/app/src/main/java/gallery/memories/service/DownloadService.kt b/android/app/src/main/java/gallery/memories/service/DownloadService.kt index 8807195d..3aad7d91 100644 --- a/android/app/src/main/java/gallery/memories/service/DownloadService.kt +++ b/android/app/src/main/java/gallery/memories/service/DownloadService.kt @@ -6,14 +6,15 @@ import android.content.Intent import android.net.Uri import android.os.Environment import android.webkit.CookieManager -import android.widget.Toast import androidx.appcompat.app.AppCompatActivity import androidx.collection.ArrayMap import androidx.media3.common.util.UnstableApi +import org.json.JSONArray import java.util.concurrent.CountDownLatch @UnstableApi class DownloadService(private val mActivity: AppCompatActivity, private val query: TimelineQuery) { private val mDownloads: MutableMap Unit> = ArrayMap() + private var mShareBlobs: JSONArray? = null /** * Callback when download is complete @@ -31,8 +32,6 @@ import java.util.concurrent.CountDownLatch return } } - - Toast.makeText(mActivity, "Download Complete", Toast.LENGTH_SHORT).show() } } @@ -77,48 +76,68 @@ import java.util.concurrent.CountDownLatch } /** - * Share a URL as a blob - * @param url The URL to share + * Share the blobs from URLs already set by setShareBlobs * @return True if the URL was shared */ @Throws(Exception::class) - fun shareBlobFromUrl(url: String): Boolean { - val id = queue(url, "") - val latch = CountDownLatch(1) + fun shareBlobs(): Boolean { + if (mShareBlobs == null) throw Exception("No blobs to share") + + // All URIs to share including remote and local files + val uris = ArrayList() + val dlIds = ArrayList() + + // Process all objects to share + for (i in 0 until mShareBlobs!!.length()) { + val obj = mShareBlobs!!.getJSONObject(i) + + // If AUID is found, then look for local file + val auid = obj.getString("auid") + if (auid != "") { + val sysImgs = query.getSystemImagesByAUIDs(listOf(auid)) + if (sysImgs.isNotEmpty()) { + uris.add(sysImgs[0].uri) + continue + } + } + + // Queue a download for remote files + dlIds.add(queue(obj.getString("href"), "")) + } + + // Wait for all downloads to complete + val latch = CountDownLatch(dlIds.size) synchronized(mDownloads) { - mDownloads.put(id, fun() { latch.countDown() }) + for (dlId in dlIds) { + mDownloads.put(dlId, fun() { latch.countDown() }) + } } latch.await() // Get the URI of the downloaded file - val sUri = getDownloadedFileURI(id) ?: throw Exception("Failed to download file") - val uri = Uri.parse(sUri) + for (id in dlIds) { + val sUri = getDownloadedFileURI(id) ?: throw Exception("Failed to download file") + uris.add(Uri.parse(sUri)) + } // Create sharing intent - val intent = Intent(Intent.ACTION_SEND) - intent.type = mActivity.contentResolver.getType(uri) - intent.putExtra(Intent.EXTRA_STREAM, uri) + val intent = Intent(Intent.ACTION_SEND_MULTIPLE) + intent.type = "*/*" + intent.putExtra(Intent.EXTRA_STREAM, uris) mActivity.startActivity(Intent.createChooser(intent, null)) + + // Reset the blobs + mShareBlobs = null + return true } /** - * Share a local image - * @param auid The AUID of the image to share - * @return True if the image was shared + * Set the blobs to share + * @param objects The blobs to share */ - @Throws(Exception::class) - fun shareLocal(auid: String): Boolean { - val sysImgs = query.getSystemImagesByAUIDs(listOf(auid)) - if (sysImgs.isEmpty()) throw Exception("Image not found locally") - val uri = sysImgs[0].uri - - val intent = Intent(Intent.ACTION_SEND) - intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) - intent.type = mActivity.contentResolver.getType(uri) - intent.putExtra(Intent.EXTRA_STREAM, uri) - mActivity.startActivity(Intent.createChooser(intent, null)) - return true + fun setShareBlobs(objects: JSONArray) { + mShareBlobs = objects } /**