Add support image in share

Author: anton-knyazev

core/build.gradle

@@ -35,8 +35,8 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    api 'com.github.Omega-R:OmegaLaunchers:ef6c71e'
-    api 'com.github.Omega-R.OmegaTypes:omegatypes:1.0.1'
+    implementation 'com.github.Omega-R:OmegaLaunchers:1.0.2'
+    api 'com.github.Omega-R.OmegaTypes:omegatypes:1.0.2'
 
     compileOnly "androidx.appcompat:appcompat:$androidX"
 }

core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/BaseUriBuilder.kt

@@ -15,7 +15,9 @@ import android.graphics.Bitmap
 import android.net.Uri
 import com.omega_r.libs.omegaintentbuilder.builders.share.DownloadBuilder
 import com.omega_r.libs.omegaintentbuilder.downloader.Download
+import com.omega_r.libs.omegaintentbuilder.models.RemoteFileInfo
 import com.omega_r.libs.omegaintentbuilder.providers.FileProvider
+import com.omega_r.libs.omegatypes.Image
 import java.io.File
 import java.io.FileOutputStream
 
@@ -24,7 +26,7 @@ abstract class BaseUriBuilder() : BaseActivityBuilder(), Download<BaseUriBuilder
     private val uriSet: MutableSet<Uri> = mutableSetOf()
     private val fileSet: MutableSet<File> = mutableSetOf()
 
-    private val downloadBuilder = DownloadBuilder(this)
+    private val downloadBuilder by lazy { DownloadBuilder(this) }
     private var bitmapIndex = 0
     private var localFilesDir: File? = null
 
@@ -100,6 +102,15 @@ abstract class BaseUriBuilder() : BaseActivityBuilder(), Download<BaseUriBuilder
         return downloadBuilder.fileUrlWithName(urlAddress, name)
     }
 
+    fun images(vararg image: Image): DownloadBuilder<BaseUriBuilder> {
+        return downloadBuilder.images(image)
+    }
+
+    @JvmOverloads
+    fun image(image: Image, name: String? = null, mimeType: String? = null): DownloadBuilder<BaseUriBuilder> {
+        return downloadBuilder.image(image, name, mimeType)
+    }
+
     /**
      * @param file File
      * @return BaseUriBuilder for method chaining

core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/share/DownloadBuilder.kt

@@ -15,25 +15,26 @@ import com.omega_r.libs.omegaintentbuilder.builders.BaseUriBuilder
 import com.omega_r.libs.omegaintentbuilder.downloader.Download
 import com.omega_r.libs.omegaintentbuilder.downloader.DownloadAsyncTask
 import com.omega_r.libs.omegaintentbuilder.downloader.DownloadCallback
-import com.omega_r.libs.omegaintentbuilder.models.FileInfo
+import com.omega_r.libs.omegaintentbuilder.models.RemoteFileInfo
+import com.omega_r.libs.omegatypes.Image
 
 /**
  * DownloadBuilder is a helper for download files from internet and add it to createdIntent
  * to share content.
  */
 class DownloadBuilder<T>(private val intentBuilder: T) where T : BaseUriBuilder, T : Download<BaseUriBuilder> {
 
-    val fileInfoSet: MutableSet<FileInfo> = mutableSetOf()
+    private val fileInfoSet = mutableSetOf<RemoteFileInfo>()
+
 
     /**
      * Add a array of url addresses to download.
      *
      * @param urlAddresses Array of String addresses to download and share
      * @return This DownloadBuilder for method chaining
      */
-    fun filesUrls(vararg urlAddresses: String): DownloadBuilder<T> {
-        urlAddresses.forEach { fileInfoSet.put(it) }
-        return this
+    fun filesUrls(vararg urlAddresses: String) = apply {
+        fileInfoSet += urlAddresses.map { RemoteFileInfo(it) }
     }
 
     /**
@@ -45,20 +46,31 @@ class DownloadBuilder<T>(private val intentBuilder: T) where T : BaseUriBuilder,
      */
     @JvmOverloads
     fun fileUrlWithMimeType(urlAddress: String, mimeType: String? = null): DownloadBuilder<T> {
-        fileInfoSet.put(urlAddress, mimeType)
+        fileInfoSet += RemoteFileInfo(urlAddress, mimeType)
         return this
     }
 
+    fun images(images: Array<out Image>) = apply {
+        fileInfoSet += images.map { RemoteFileInfo(image = it) }
+    }
+
+    fun images(image: Image) = apply {
+        fileInfoSet += RemoteFileInfo(image = image)
+    }
+
+    fun image(image: Image, name: String? = null, mimeType: String? = null) = apply {
+        fileInfoSet += RemoteFileInfo(image = image, mimeType = mimeType, originalName = name)
+    }
+
     /**
      * Add a String url address for downloading.
      *
      * @param urlAddress String address for downloading and share
      * @param name String - Your own file name with type ("example.mp3")
      * @return This DownloadBuilder for method chaining
      */
-    fun fileUrlWithName(urlAddress: String, name: String): DownloadBuilder<T> {
-        fileInfoSet.put(urlAddress, null, name)
-        return this
+    fun fileUrlWithName(urlAddress: String, name: String) = apply {
+        fileInfoSet += RemoteFileInfo(urlAddress, null, name)
     }
 
     /**
@@ -67,13 +79,8 @@ class DownloadBuilder<T>(private val intentBuilder: T) where T : BaseUriBuilder,
      * @param collection Collection of String addresses to download and share
      * @return This DownloadBuilder for method chaining
      */
-    fun filesUrls(collection: Collection<String>): DownloadBuilder<T> {
-        collection.forEach { fileInfoSet.put(it) }
-        return this
-    }
-
-    private fun MutableSet<FileInfo>.put(urlAddress: String, mimeType: String? = null, name: String? = null) {
-        this.add(FileInfo(urlAddress, mimeType, name))
+    fun filesUrls(collection: Collection<String>) = apply {
+        fileInfoSet += collection.map { RemoteFileInfo(it) }
     }
 
     /**
@@ -87,8 +94,9 @@ class DownloadBuilder<T>(private val intentBuilder: T) where T : BaseUriBuilder,
             callback.onDownloaded(true, intentBuilder.createIntentHandler(context))
             return
         }
-        val downloader = DownloadAsyncTask(context, intentBuilder, intentBuilder.getLocalFilesDir(context), callback)
-        downloader.execute(fileInfoSet)
+
+        DownloadAsyncTask(context, intentBuilder, intentBuilder.getLocalFilesDir(context), callback)
+                .execute(fileInfoSet)
     }
 
 

core/src/main/java/com/omega_r/libs/omegaintentbuilder/downloader/DownloadAsyncTask.kt

@@ -3,99 +3,80 @@ package com.omega_r.libs.omegaintentbuilder.downloader
 import android.content.Context
 import android.net.Uri
 import android.os.AsyncTask
-import androidx.annotation.NonNull
 import android.util.Log
+import androidx.annotation.NonNull
 import com.omega_r.libs.omegaintentbuilder.builders.BaseUriBuilder
-import com.omega_r.libs.omegaintentbuilder.models.FileInfo
-import com.omega_r.libs.omegaintentbuilder.providers.FileProvider.getFileName
+import com.omega_r.libs.omegaintentbuilder.models.RemoteFileInfo
 import com.omega_r.libs.omegaintentbuilder.providers.FileProvider.getLocalFileUri
-import java.io.File
-import java.io.FileOutputStream
-import java.io.IOException
-import java.io.InputStream
-import java.net.HttpURLConnection
-import java.net.URL
+import java.io.*
 
 internal class DownloadAsyncTask<T>(
         private val context: Context,
         private val intentBuilder: T,
         private val localDirFile: File,
         private val downloadCallback: DownloadCallback
-) : AsyncTask<Set<FileInfo>, Void, List<Uri>>() where T : BaseUriBuilder {
-
-  companion object {
-    private val TAG = DownloadAsyncTask::class.java.simpleName
-    private const val BUFFER_SIZE = 8192
-  }
-
-  override fun doInBackground(vararg params: Set<FileInfo>): List<Uri> {
-    val fileSet: MutableSet<File> = mutableSetOf()
-    val fileInfoSet: MutableSet<FileInfo> = mutableSetOf()
-    params.forEach { fileInfoSet.addAll(it) }
+) : AsyncTask<Set<RemoteFileInfo>, Void, List<Uri>>() where T : BaseUriBuilder {
 
-    fileInfoSet.forEach {
-      try {
-        downloadFile(it)?.let { fileSet.add(it) }
-      } catch (exc: IOException)  {
-        Log.e(TAG, exc.toString())
-      }
+    companion object {
+        private val TAG = DownloadAsyncTask::class.java.simpleName
+        private const val EOF = -1
+        private const val BUFFER_SIZE = 8192
     }
 
-    val listUri = mutableListOf<Uri>();
-    fileSet.forEach { it -> listUri.add(getLocalFileUri(context, it)) }
-    return listUri
-  }
-
-
-  override fun onPostExecute(result: List<Uri>) {
-    super.onPostExecute(result)
-      if (result.isEmpty()) {
-        downloadCallback.onDownloaded(false, intentBuilder.createIntentHandler(context))
-      } else {
-        intentBuilder.uri(result)
-        downloadCallback.onDownloaded(true, intentBuilder.createIntentHandler(context))
-      }
-  }
+    override fun doInBackground(vararg params: Set<RemoteFileInfo>): List<Uri> {
+        val fileSet: MutableSet<File> = mutableSetOf()
+        val fileInfoSet: MutableSet<RemoteFileInfo> = mutableSetOf()
+        params.forEach { fileInfoSet.addAll(it) }
+
+        fileInfoSet.forEachIndexed { index: Int, remoteFileInfo: RemoteFileInfo ->
+            try {
+                downloadFile(remoteFileInfo, index)?.let { fileSet.add(it) }
+            } catch (exc: IOException) {
+                Log.e(TAG, exc.toString())
+            }
+        }
 
-  @Throws(IOException::class)
-  private fun downloadFile(@NonNull fileInfo: FileInfo): File? {
-    val url = URL(fileInfo.urlAddress)
-    val httpConnection: HttpURLConnection = url.openConnection() as HttpURLConnection
+        val listUri = mutableListOf<Uri>();
+        fileSet.forEach { it -> listUri.add(getLocalFileUri(context, it)) }
+        return listUri
+    }
 
-    val responseCode = httpConnection.responseCode
-    if (responseCode == HttpURLConnection.HTTP_OK) {
-      val inputStream: InputStream = httpConnection.inputStream;
-      val file: File
 
-      if (fileInfo.originalName.isNullOrEmpty()) {
-        if (fileInfo.mimeType.isNullOrEmpty()) {
-          file = File(localDirFile, getFileName(fileInfo.urlAddress))
+    override fun onPostExecute(result: List<Uri>) {
+        super.onPostExecute(result)
+        if (result.isEmpty()) {
+            downloadCallback.onDownloaded(false, intentBuilder.createIntentHandler(context))
         } else {
-          file = File(localDirFile, getFileName(fileInfo.urlAddress, fileInfo.mimeType))
+            intentBuilder.uri(result)
+            downloadCallback.onDownloaded(true, intentBuilder.createIntentHandler(context))
         }
-      } else {
-          file = File(localDirFile, fileInfo.originalName)
-      }
+    }
 
-      val fileOutputStream = FileOutputStream(file)
-      var bytesRead = 0;
-      val buffer = ByteArray(BUFFER_SIZE)
+    @Throws(IOException::class)
+    private fun downloadFile(@NonNull fileInfo: RemoteFileInfo, index: Int): File? {
+        return fileInfo.openStream(context) { inputStream ->
+            File(localDirFile, fileInfo.getFileName(index)).also {
+                FileOutputStream(it)
+                        .copy(inputStream)
+                        .flushAndClose()
+            }
+        }
+    }
 
-      do {
-        fileOutputStream.write(buffer, 0, bytesRead)
-        bytesRead = inputStream.read(buffer)
-      } while (bytesRead > 0)
+    private fun OutputStream.copy(inputStream: InputStream) = also {
+        val byteArray = ByteArray(BUFFER_SIZE)
+        while (true) {
+            val len = inputStream.read(byteArray)
+            if (len == -1)
+                break
+            write(byteArray, 0, len)
+        }
 
-      fileOutputStream.close()
-      inputStream.close()
-      httpConnection.disconnect()
+    }
 
-      return file
-    } else {
-      httpConnection.disconnect()
-      Log.e(TAG, "No file to download. Server replied HTTP code: " + responseCode);
-      return null
+    private fun OutputStream.flushAndClose() {
+        flush()
+        close()
     }
-  }
 
 }