Merge pull request #323 from hannesa2/KotlinDownloaders

Kotlin downloaders
hannesa2 · May 17, 2024 · c59d488 · c59d488
2 parents 53d72d4 + 4165f0f
commit c59d488
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 118 deletions.
diff --git a/library/src/main/java/com/panoramagl/downloaders/PLFileDownloaderListener.java b/library/src/main/java/com/panoramagl/downloaders/PLFileDownloaderListener.java
diff --git a/library/src/main/java/com/panoramagl/downloaders/PLFileDownloaderListener.kt b/library/src/main/java/com/panoramagl/downloaders/PLFileDownloaderListener.kt
@@ -0,0 +1,13 @@
+package com.panoramagl.downloaders
+
+interface PLFileDownloaderListener {
+    fun didBeginDownload(url: String?, startTime: Long)
+
+    fun didProgressDownload(url: String?, progress: Int)
+
+    fun didStopDownload(url: String?)
+
+    fun didEndDownload(url: String?, data: ByteArray?, elapsedTime: Long)
+
+    fun didErrorDownload(url: String?, error: String?, responseCode: Int, data: ByteArray?)
+}
diff --git a/library/src/main/java/com/panoramagl/downloaders/PLIFileDownloaderManager.java b/library/src/main/java/com/panoramagl/downloaders/PLIFileDownloaderManager.java
diff --git a/library/src/main/java/com/panoramagl/downloaders/PLIFileDownloaderManager.kt b/library/src/main/java/com/panoramagl/downloaders/PLIFileDownloaderManager.kt
@@ -0,0 +1,17 @@
+package com.panoramagl.downloaders
+
+interface PLIFileDownloaderManager {
+    val isRunning: Boolean
+
+    fun add(fileDownloader: PLIFileDownloader?)
+
+    fun remove(fileDownloader: PLIFileDownloader?): Boolean
+
+    fun removeAll(): Boolean
+
+    fun download(fileDownloader: PLIFileDownloader?)
+
+    fun start(): Boolean
+
+    fun stop(): Boolean
+}
diff --git a/library/src/main/java/com/panoramagl/downloaders/PLLocalFileDownloader.kt b/library/src/main/java/com/panoramagl/downloaders/PLLocalFileDownloader.kt
@@ -46,15 +46,17 @@ class PLLocalFileDownloader(private var context: Context, url: String?, listener
                     val file = File(url.substring(7))
                     if (file.canRead()) `is` = FileInputStream(file)
                 }
-            } else throw PLRequestInvalidatedException(url)
+            } else
+                throw PLRequestInvalidatedException(url)
             if (this.isRunning) {
                 result = ByteArray(`is`!!.available())
                 `is`.read(result)
                 if (hasListener) {
                     listener!!.didProgressDownload(url, 100)
                     listener.didEndDownload(url, result, System.currentTimeMillis() - startTime)
                 }
-            } else throw PLRequestInvalidatedException(url)
+            } else
+                throw PLRequestInvalidatedException(url)
         } catch (e: Throwable) {
             if (this.isRunning) {
                 Timber.e(e)

diff --git a/library/src/main/java/com/panoramagl/downloaders/PLRequestInvalidatedException.java b/library/src/main/java/com/panoramagl/downloaders/PLRequestInvalidatedException.java
diff --git a/library/src/main/java/com/panoramagl/downloaders/PLRequestInvalidatedException.kt b/library/src/main/java/com/panoramagl/downloaders/PLRequestInvalidatedException.kt
@@ -0,0 +1,3 @@
+package com.panoramagl.downloaders
+
+class PLRequestInvalidatedException(url: String) : RuntimeException(String.format("Request to %s was invalidated", url))
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		package com.panoramagl.downloaders

		class PLRequestInvalidatedException(url: String) : RuntimeException(String.format("Request to %s was invalidated", url))