Merge pull request #62 from Microsoft/android-support

Android support

Author: geof90

.gitignore

@@ -1,3 +1,7 @@
+# OSX
+#
+.DS_Store
+
 # Xcode
 #
 # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
@@ -97,3 +101,49 @@ xcuserdata
 *.xccheckout
 *.moved-aside
 *.xcuserstate
+
+# Intellij project files
+*.iml
+*.ipr
+*.iws
+.idea/
+
+#Gradle
+.gradletasknamecache
+.gradle/
+build/
+bin/
+
+# Built application files
+*.apk
+*.ap_
+
+# Files for the Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+
+# Gradle files
+.gradle/
+build/
+*/build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/

.watchmanconfig

@@ -0,0 +1 @@
+{}

AlertAdapter.js

@@ -0,0 +1,34 @@
+'use strict';
+
+var Platform = require("Platform");
+var Alert;
+
+if (Platform.OS === "android") {
+  var CodePushDialog = require("react-native").NativeModules.CodePushDialog;
+  Alert = {
+    alert: function(title, message, buttons) {
+      if (buttons.length > 2) {
+        throw "Can only show 2 buttons for Android dialog.";
+      }
+      
+      var button1Text = buttons[0] ? buttons[0].text : null;
+      var button2Text = buttons[1] ? buttons[1].text : null;
+      
+      CodePushDialog.showDialog(
+        title, message, button1Text, button2Text,
+        (buttonPressedId) => {
+          buttons[buttonPressedId].onPress && buttons[buttonPressedId].onPress();
+        }, 
+        (error) => {
+          throw error;
+        });
+    }
+  };
+} else if (Platform.OS === "ios") {   
+  var { AlertIOS } = require("react-native");
+  Alert = AlertIOS;
+}
+
+module.exports = {
+  Alert: Alert
+}

CodePush.android.js

@@ -1,10 +1,10 @@
 'use strict';
 
-var { AlertIOS } = require("react-native");
-var NativeCodePush = require("react-native").NativeModules.CodePush;
-var packageMixins = require("./package-mixins")(NativeCodePush);
 var requestFetchAdapter = require("./request-fetch-adapter.js");
 var Sdk = require("code-push/script/acquisition-sdk").AcquisitionManager;
+var NativeCodePush = require("react-native").NativeModules.CodePush;
+var PackageMixins = require("./package-mixins")(NativeCodePush);
+var { Alert } = require("./AlertAdapter");
 
 function checkForUpdate(deploymentKey = null) {
   var config, sdk;
@@ -21,14 +21,14 @@ function checkForUpdate(deploymentKey = null) {
             }
 
             sdk = getSDK(config);
-            return getCurrentPackage();
+            // Allow dynamic overwrite of function. This is only to be used for tests.
+            return module.exports.getCurrentPackage();
           })
           .then((localPackage) => {
             var queryPackage = { appVersion: config.appVersion };
             if (localPackage && localPackage.appVersion === config.appVersion) {
               queryPackage = localPackage;
             }
-
             return new Promise((resolve, reject) => {
               sdk.queryUpdateWithCurrentPackage(queryPackage, (err, update) => {
                 if (err) {
@@ -41,7 +41,7 @@ function checkForUpdate(deploymentKey = null) {
                   return resolve(null);
                 }
 
-                update = Object.assign(update, packageMixins.remote);
+                update = Object.assign(update, PackageMixins.remote);
 
                 NativeCodePush.isFailedUpdate(update.packageHash)
                   .then((isFailedHash) => {
@@ -248,7 +248,7 @@ function sync(options = {}, syncStatusChangeCallback, downloadProgressCallback)
           }
 
           syncStatusChangeCallback(CodePush.SyncStatus.AWAITING_USER_ACTION);
-          AlertIOS.alert(syncOptions.updateDialog.title, message, dialogButtons);
+          Alert.alert(syncOptions.updateDialog.title, message, dialogButtons);
         } else {
           doDownloadAndInstall();
         }

CodePush.ios.js renamed to CodePush.js

@@ -321,7 +321,7 @@ - (void)startRollbackTimer:(int)rollbackTimeout
         progressCallback:^(long expectedContentLength, long receivedContentLength) {
             // Notify the script-side about the progress
             [self.bridge.eventDispatcher
-                sendAppEventWithName:@"CodePushDownloadProgress"
+                sendDeviceEventWithName:@"CodePushDownloadProgress"
                 body:@{
                         @"totalBytes":[NSNumber numberWithLong:expectedContentLength],
                         @"receivedBytes":[NSNumber numberWithLong:receivedContentLength]

CodePush.m

@@ -215,9 +215,8 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/../../React/**",
-					"$(SRCROOT)/../../node_modules/react-native/React/**",
 					"$(SRCROOT)/node_modules/react-native/React/**",
+					"$(SRCROOT)/Examples/CodePushDemoApp/node_modules/react-native/React/**",
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = "-ObjC";
@@ -232,9 +231,8 @@
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
 					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/../../React/**",
-					"$(SRCROOT)/../../node_modules/react-native/React/**",
 					"$(SRCROOT)/node_modules/react-native/React/**",
+					"$(SRCROOT)/Examples/CodePushDemoApp/node_modules/react-native/React/**",
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = "-ObjC";

CodePush.xcodeproj/project.pbxproj

@@ -27,3 +27,49 @@ node_modules/
 npm-debug.log
 
 main.jsbundle
+
+# Intellij project files
+*.iml
+*.ipr
+*.iws
+.idea/
+
+#Gradle
+.gradletasknamecache
+.gradle/
+build/
+bin/
+
+# Built application files
+*.apk
+*.ap_
+
+# Files for the Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+
+# Gradle files
+.gradle/
+build/
+*/build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/

Examples/CodePushDemoApp/.gitignore

@@ -0,0 +1 @@
+{}

Examples/CodePushDemoApp/.watchmanconfig

@@ -23,7 +23,7 @@ - (void)setUp
 
   NSOperatingSystemVersion version = [[NSProcessInfo processInfo] operatingSystemVersion];
   RCTAssert(version.majorVersion == 8 || version.minorVersion == 3, @"Tests should be run on iOS 8.3, found %zd.%zd.%zd", version.majorVersion, version.minorVersion, version.patchVersion);
-  _runner = RCTInitRunnerForApp(@"CodePushDemoAppTests/DownloadProgressTests/DownloadProgressTestApp.ios", nil);
+  _runner = RCTInitRunnerForApp(@"CodePushDemoAppTests/DownloadProgressTests/DownloadProgressTestApp", nil);
 }
 
 #pragma mark Logic Tests