refactor: clean code

Quickits · Aug 22, 2019 · f3f067d · f3f067d
1 parent d2e3eba
commit f3f067d
Showing 1 changed file with 22 additions and 19 deletions.
diff --git a/library/src/main/java/cn/quickits/halia/LoadingDialog.kt b/library/src/main/java/cn/quickits/halia/LoadingDialog.kt
@@ -40,25 +40,10 @@ class LoadingDialog<T>(private val observable: Observable<T>) {
 
                 }
                 .subscribeOn(Schedulers.io())
-                .subscribe({
-                    isManualClose = true
-                    processor.onNext(it)
-                    processor.onComplete()
-                    try {
-                        dialog?.dismiss()
-                    } catch (e: IllegalArgumentException) {
-
-                    }
-                }, {
-                    isManualClose = true
-                    processor.onError(it)
-                    processor.onComplete()
-                    try {
-                        dialog?.dismiss()
-                    } catch (e: IllegalArgumentException) {
-
-                    }
-                })
+                .subscribe(
+                    { data -> dispatchDataOrError(data = data) },
+                    { error -> dispatchDataOrError(error = error) }
+                )
         }
 
         dialog?.setOnDismissListener {
@@ -80,4 +65,22 @@ class LoadingDialog<T>(private val observable: Observable<T>) {
         dialog?.dismiss()
     }
 
+    private fun dispatchDataOrError(data: T? = null, error: Throwable? = null) {
+        isManualClose = true
+
+        if (data != null) {
+            processor.onNext(data)
+        } else if (error != null) {
+            processor.onError(error)
+        }
+
+        processor.onComplete()
+
+        try {
+            dialog?.dismiss()
+        } catch (e: IllegalArgumentException) {
+
+        }
+    }
+
 }