Android implementation

Author: lostintangent

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

@@ -353,9 +353,15 @@ public CodePushNativeModule(ReactApplicationContext reactContext) {
         @Override
         public Map<String, Object> getConstants() {
             final Map<String, Object> constants = new HashMap<>();
+            
             constants.put("codePushInstallModeImmediate", CodePushInstallMode.IMMEDIATE.getValue());
             constants.put("codePushInstallModeOnNextRestart", CodePushInstallMode.ON_NEXT_RESTART.getValue());
             constants.put("codePushInstallModeOnNextResume", CodePushInstallMode.ON_NEXT_RESUME.getValue());
+            
+            constants.put("codePushUpdateStateRunning", CodePushUpdateState.RUNNING.getValue());
+            constants.put("codePushUpdateStatePending", CodePushUpdateState.PENDING.getValue());
+            constants.put("codePushUpdateStateLatest", CodePushUpdateState.LATEST.getValue());
+            
             return constants;
         }
 
@@ -481,31 +487,53 @@ public void getConfiguration(Promise promise) {
 
             promise.resolve(configMap);
         }
-
+        
         @ReactMethod
-        public void getCurrentPackage(final Promise promise) {
+        public void getUpdateMetadata(final int updateState, final Promise promise) {
             AsyncTask<Void, Void, Void> asyncTask = new AsyncTask<Void, Void, Void>() {
                 @Override
                 protected Void doInBackground(Void... params) {
                     WritableMap currentPackage = codePushPackage.getCurrentPackage();
+                    
                     if (currentPackage == null) {
                         promise.resolve("");
                         return null;
                     }
 
-                    if (isRunningBinaryVersion) {
-                        currentPackage.putBoolean("_isDebugOnly", true);
-                    }
-
-                    Boolean isPendingUpdate = false;
+                    Boolean currentUpdateIsPending = false;
 
                     if (currentPackage.hasKey(PACKAGE_HASH_KEY)) {
                         String currentHash = currentPackage.getString(PACKAGE_HASH_KEY);
-                        isPendingUpdate = CodePush.this.isPendingUpdate(currentHash);
+                        currentUpdateIsPending = CodePush.this.isPendingUpdate(currentHash);
                     }
+                    
+                    if (updateState == CodePushUpdateState.PENDING.getValue() && !currentUpdateIsPending) {
+                        // The caller wanted a pending update
+                        // but there isn't currently one.
+                        promise.resolve("");
+                    } else if (updateState == CodePushUpdateState.RUNNING.getValue() && currentUpdateIsPending) {
+                        // The caller wants the running update, but the current
+                        // one is pending, so we need to grab the previous.
+                        promise.resolve(codePushPackage.getPreviousPackage());
+                    } else {
+                        // The current package satisfies the request:
+                        // 1) Caller wanted a pending, and there is a pending update
+                        // 2) Caller wanted the running update, and there isn't a pending
+                        // 3) Calers wants the latest update, regardless if it's pending or not
+                        
+                        if (isRunningBinaryVersion) {
+                            // This only matters in Debug builds. Since we do not clear "outdated" updates,
+                            // we need to indicate to the JS side that somehow we have a current update on
+                            // disk that is not actually running.
+                            currentPackage.putBoolean("_isDebugOnly", true);
+                        }
 
-                    currentPackage.putBoolean("isPending", isPendingUpdate);
-                    promise.resolve(currentPackage);
+                        // To support differentiating pending vs. non-pending updates
+                        // when request an update state of LATEST, provide an isPending flag
+                        currentPackage.putBoolean("isPending", currentUpdateIsPending);
+                        promise.resolve(currentPackage);
+                    }
+                    
                     return null;
                 }
             };

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

@@ -18,7 +18,6 @@
 import java.nio.ByteBuffer;
 
 public class CodePushPackage {
-
     private final String CODE_PUSH_FOLDER_PREFIX = "CodePush";
     private final String CURRENT_PACKAGE_KEY = "currentPackage";
     private final String DIFF_MANIFEST_FILE_NAME = "hotcodepush.json";
@@ -124,18 +123,21 @@ public String getPreviousPackageHash() {
     }
 
     public WritableMap getCurrentPackage() {
-        String folderPath = getCurrentPackageFolderPath();
-        if (folderPath == null) {
+        String packageHash = getCurrentPackageHash();
+        if (packageHash == null) {
             return null;
         }
-
-        String packagePath = CodePushUtils.appendPathComponent(folderPath, PACKAGE_FILE_NAME);
-        try {
-            return CodePushUtils.getWritableMapFromFile(packagePath);
-        } catch (IOException e) {
-            // Should not happen unless the update metadata was somehow deleted.
+        
+        return getPackage(packageHash);
+    }
+    
+    public WritableMap getPreviousPackage() {
+        String packageHash = getPreviousPackageHash();
+        if (packageHash == null) {
             return null;
         }
+        
+        return getPackage(packageHash);
     }
 
     public WritableMap getPackage(String packageHash) {
@@ -340,8 +342,6 @@ public void downloadAndReplaceCurrentBundle(String remoteBundleUrl, String bundl
     }
 
     public void clearUpdates() {
-        File statusFile = new File(getStatusFilePath());
-        statusFile.delete();
         FileUtils.deleteDirectoryAtPath(getCodePushPath());
     }
-}
+}

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

@@ -0,0 +1,15 @@
+package com.microsoft.codepush.react;
+
+public enum CodePushUpdateState {
+    RUNNING(0),
+    PENDING(1),
+    LATEST(2);
+
+    private final int value;
+    CodePushUpdateState(int value) {
+        this.value = value;
+    }
+    public int getValue() {
+        return this.value;
+    }
+}