diff --git a/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt b/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt
index 676feebc44a0b9deca23bc5b4d82adeb8571e47a..9683aa0034a049fae2d429c79835f6b5403aea89 100644
--- a/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/MainActivity.kt
@@ -90,7 +90,7 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback {
         }
 
         clearBtn.setOnClickListener {
-            AppUtil.clearCache()
+            clearCache()
         }
     }
 
@@ -138,6 +138,16 @@ class MainActivity : AppCompatActivity(), IAppBaseCallback {
         }
     }
 
+    private fun clearCache() {
+        clearBtn.isEnabled = false
+        ThreadProxy.getInstance().execute {
+            AppUtil.clearCache()
+            runOnUiThread {
+                clearBtn.isEnabled = true
+            }
+        }
+    }
+
     private fun initRefreshTimer() {
         refreshTimer = Timer()
 
diff --git a/app/src/main/java/com/duolebo/blyrobot/data/ImageUploadTask.kt b/app/src/main/java/com/duolebo/blyrobot/data/ImageUploadTask.kt
index ebd657fa501772a63881002998b6de46d1435821..37cbee2654a62de5bc17f3c33c11232c8abf9202 100644
--- a/app/src/main/java/com/duolebo/blyrobot/data/ImageUploadTask.kt
+++ b/app/src/main/java/com/duolebo/blyrobot/data/ImageUploadTask.kt
@@ -103,6 +103,8 @@ class ImageUploadTask {
             }
         }
 
+        uploadTaskListener?.onComplete()
+
     }
 
     /**