Merge pull request #8 from daisuke-nomura/develop

Update library, set Nullable
daisuke-nomura · Feb 5, 2017 · d660217 · d660217
2 parents 024a410 + c5e3cd5
commit d660217
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/rxkii/build.gradle b/rxkii/build.gradle
@@ -33,8 +33,8 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'io.reactivex.rxjava2:rxjava:2.0.2'
-    compile('com.kii:cloud-sdk:2.4.12') {
+    compile 'io.reactivex.rxjava2:rxjava:2.0.5'
+    compile('com.kii:cloud-sdk:2.4.14') {
         transitive = true
     }
 }
diff --git a/rxkii/src/main/java/com/kyaracter/rxkii/RxKiiDownloader.java b/rxkii/src/main/java/com/kyaracter/rxkii/RxKiiDownloader.java
@@ -3,6 +3,7 @@
 
 import android.support.annotation.CheckResult;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 
 import com.kii.cloud.storage.resumabletransfer.KiiDownloader;
 import com.kii.cloud.storage.resumabletransfer.KiiRTransfer;
@@ -71,7 +72,7 @@ public void onProgress(@NonNull KiiRTransfer operator, long completedInBytes, lo
                             }
 
                             @Override
-                            public void onTransferCompleted(@NonNull KiiRTransfer operator, @NonNull Exception e) {
+                            public void onTransferCompleted(@NonNull KiiRTransfer operator, @Nullable Exception e) {
                                 if (e != null) {
                                     emitter.onError(e);
                                     return;

diff --git a/rxkii/src/main/java/com/kyaracter/rxkii/RxKiiUploader.java b/rxkii/src/main/java/com/kyaracter/rxkii/RxKiiUploader.java
@@ -3,6 +3,7 @@
 
 import android.support.annotation.CheckResult;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 
 import com.kii.cloud.storage.resumabletransfer.KiiRTransfer;
 import com.kii.cloud.storage.resumabletransfer.KiiRTransferCallback;
@@ -71,7 +72,7 @@ public void onProgress(@NonNull KiiRTransfer operator, long completedInBytes, lo
                             }
 
                             @Override
-                            public void onTransferCompleted(@NonNull KiiRTransfer operator, @NonNull Exception e) {
+                            public void onTransferCompleted(@NonNull KiiRTransfer operator, @Nullable Exception e) {
                                 if (e != null) {
                                     emitter.onError(e);
                                     return;