Merge pull request #50 from apivideo/bugfix/android_service_test

fix(java): fix Android service test
apivideo · Sep 1, 2022 · 05bda8a · 05bda8a
2 parents 1e43e38 + e8154a4
commit 05bda8a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/example/src/main/java/video/api/client/example/CustomUploaderService.kt b/example/src/main/java/video/api/client/example/CustomUploaderService.kt
@@ -19,7 +19,7 @@ class CustomUploaderService : UploadService(
     /**
      * You can override each of [UploadService] notification methods to customize notifications.
      */
-    override fun onUploadSuccessNotification(video: Video): Notification {
+    override fun onUploadSuccessNotification(id: String, video: Video): Notification {
         // Return your custom the notification
         return NotificationCompat.Builder(this, channelId)
             .setStyle(notificationIconResourceId, notificationColorResourceId)

diff --git a/src/androidTest/java/video/api/integration/UploadServiceTest.java b/src/androidTest/java/video/api/integration/UploadServiceTest.java
@@ -93,7 +93,7 @@ public void onLastUpload() {
                 }
 
                 @Override
-                public void onUploadComplete(@NonNull Video video) {
+                public void onUploadComplete(@NonNull String id, @NonNull Video video) {
                     successLatch.countDown();
                 }
 
@@ -138,7 +138,7 @@ public void onLastUpload() {
                 }
 
                 @Override
-                public void onUploadComplete(@NonNull Video video) {
+                public void onUploadComplete(@NonNull String id, @NonNull Video video) {
                     successLatch.countDown();
                 }
 
@@ -186,7 +186,7 @@ public void onLastUpload() {
                 }
 
                 @Override
-                public void onUploadComplete(@NonNull Video video) {
+                public void onUploadComplete(@NonNull String id, @NonNull Video video) {
                     successLatch.countDown();
                 }
 
@@ -261,7 +261,7 @@ public void onLastUpload() {
                 }
 
                 @Override
-                public void onUploadComplete(@NonNull Video video) {
+                public void onUploadComplete(@NonNull String id, @NonNull Video video) {
                     successLatch.countDown();
                 }
 
@@ -335,7 +335,7 @@ public void onLastUpload() {
                 }
 
                 @Override
-                public void onUploadComplete(@NonNull Video video) {
+                public void onUploadComplete(@NonNull String id, @NonNull Video video) {
                     successLatch.countDown();
                 }
 

diff --git a/src/androidTest/java/video/api/integration/services/UploadServiceWithoutNotifications.java b/src/androidTest/java/video/api/integration/services/UploadServiceWithoutNotifications.java
@@ -17,7 +17,7 @@ public Notification onUploadStartedNotification(@NonNull String id) {
 
     @Nullable
     @Override
-    public Notification onUploadSuccessNotification(@NonNull Video video) {
+    public Notification onUploadSuccessNotification(@NonNull String id, @NonNull Video video) {
         return null;
     }
 

diff --git a/src/main/java/video/api/client/api/services/UploadService.kt b/src/main/java/video/api/client/api/services/UploadService.kt
@@ -102,7 +102,7 @@ open class UploadService(
 
         override fun onUploadComplete(id: String, video: Video) {
             _numOfUploaded++
-            onUploadSuccessNotification(video)?.let { notify(it) }
+            onUploadSuccessNotification(id, video)?.let { notify(it) }
             listeners.forEach { it.onUploadComplete(id, video) }
 
             if (!hasRemaining) {
@@ -274,7 +274,7 @@ open class UploadService(
      * @param video The video instance (contains info incl. the video id)
      * @return The notification to be displayed or null
      */
-    open fun onUploadSuccessNotification(video: Video): Notification? = null
+    open fun onUploadSuccessNotification(id: String, video: Video): Notification? = null
 
     /**
      * Called when the queue has no more file to upload