Merge pull request #77 from Microsoft/asyncify-methods

Asyncify methods

Author: geof90

android/app/src/main/java/com/microsoft/codepush/react/CodePush.java

@@ -265,52 +265,61 @@ private void loadBundle() {
         }
 
         @ReactMethod
-        public void installUpdate(ReadableMap updatePackage, int rollbackTimeout, int installMode, Promise promise) {
-            try {
-                codePushPackage.installPackage(updatePackage);
-
-                String pendingHash = CodePushUtils.tryGetString(updatePackage, codePushPackage.PACKAGE_HASH_KEY);
-                if (pendingHash == null) {
-                    throw new CodePushUnknownException("Update package to be installed has no hash.");
-                } else {
-                    savePendingUpdate(pendingHash, rollbackTimeout);
-                }
-
-                if (installMode == CodePushInstallMode.IMMEDIATE.getValue()) {
-                    loadBundle();
-                } else if (installMode == CodePushInstallMode.ON_NEXT_RESUME.getValue()) {
-                    // Ensure we do not add the listener twice.
-                    if (lifecycleEventListener == null) {
-                        lifecycleEventListener = new LifecycleEventListener() {
-                            @Override
-                            public void onHostResume() {
-                                loadBundle();
-                            }
-
-                            @Override
-                            public void onHostPause() {
+        public void installUpdate(final ReadableMap updatePackage, final int rollbackTimeout, final int installMode, final Promise promise) {
+            AsyncTask asyncTask = new AsyncTask() {
+                @Override
+                protected Void doInBackground(Object[] params) {
+                    try {
+                        codePushPackage.installPackage(updatePackage);
+
+                        String pendingHash = CodePushUtils.tryGetString(updatePackage, codePushPackage.PACKAGE_HASH_KEY);
+                        if (pendingHash == null) {
+                            throw new CodePushUnknownException("Update package to be installed has no hash.");
+                        } else {
+                            savePendingUpdate(pendingHash, rollbackTimeout);
+                        }
+
+                        if (installMode == CodePushInstallMode.IMMEDIATE.getValue()) {
+                            loadBundle();
+                        } else if (installMode == CodePushInstallMode.ON_NEXT_RESUME.getValue()) {
+                            // Ensure we do not add the listener twice.
+                            if (lifecycleEventListener == null) {
+                                lifecycleEventListener = new LifecycleEventListener() {
+                                    @Override
+                                    public void onHostResume() {
+                                        loadBundle();
+                                    }
+
+                                    @Override
+                                    public void onHostPause() {
+                                    }
+
+                                    @Override
+                                    public void onHostDestroy() {
+                                    }
+                                };
+                                getReactApplicationContext().addLifecycleEventListener(lifecycleEventListener);
                             }
+                        }
 
-                            @Override
-                            public void onHostDestroy() {
-                            }
-                        };
-                        getReactApplicationContext().addLifecycleEventListener(lifecycleEventListener);
+                        promise.resolve("");
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                        promise.reject(e.getMessage());
                     }
+
+                    return null;
                 }
+            };
 
-                promise.resolve("");
-            } catch (IOException e) {
-                e.printStackTrace();
-                promise.reject(e.getMessage());
-            }
+            asyncTask.execute();
         }
 
         @ReactMethod
         public void downloadUpdate(final ReadableMap updatePackage, final Promise promise) {
             AsyncTask asyncTask = new AsyncTask() {
                 @Override
-                protected Object doInBackground(Object[] params) {
+                protected Void doInBackground(Object[] params) {
                     try {
                         codePushPackage.downloadPackage(applicationContext, updatePackage, new DownloadProgressCallback() {
                             @Override
@@ -327,9 +336,11 @@ public void call(DownloadProgress downloadProgress) {
                         e.printStackTrace();
                         promise.reject(e.getMessage());
                     }
+
                     return null;
                 }
             };
+
             asyncTask.execute();
         }
 
@@ -344,13 +355,22 @@ public void getConfiguration(Promise promise) {
         }
 
         @ReactMethod
-        public void getCurrentPackage(Promise promise) {
-            try {
-                promise.resolve(codePushPackage.getCurrentPackage());
-            } catch (IOException e) {
-                e.printStackTrace();
-                promise.reject(e.getMessage());
-            }
+        public void getCurrentPackage(final Promise promise) {
+            AsyncTask asyncTask = new AsyncTask() {
+                @Override
+                protected Void doInBackground(Object[] params) {
+                    try {
+                        promise.resolve(codePushPackage.getCurrentPackage());
+                    } catch (IOException e) {
+                        e.printStackTrace();
+                        promise.reject(e.getMessage());
+                    }
+
+                    return null;
+                }
+            };
+
+            asyncTask.execute();
         }
 
         @ReactMethod

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-code-push",
-  "version": "1.3.0-beta",
+  "version": "1.3.1-beta",
   "description": "React Native plugin for the CodePush service",
   "main": "CodePush.js",
   "homepage": "https://microsoft.github.io/code-push",