Skip to content

Commit 38a52dc

Browse files
authored
0.29 compat + refactoring android (#398)
0.29 compat
1 parent e071938 commit 38a52dc

File tree

13 files changed

+945
-799
lines changed

13 files changed

+945
-799
lines changed

Examples/CodePushDemoApp/android/app/src/main/java/com/microsoft/codepushdemoapp/MainActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ public class MainActivity extends ReactActivity {
1212

1313
@Override
1414
protected String getJSBundleFile() {
15-
return CodePush.getBundleUrl("index.android.bundle");
15+
return CodePush.getJSBundleFile();
1616
}
1717

1818
/**

README.md

+136-97
Large diffs are not rendered by default.

android/app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ android {
1010
versionCode 1
1111
versionName "1.0"
1212
}
13-
13+
1414
buildTypes {
1515
release {
1616
minifyEnabled false
@@ -22,5 +22,5 @@ android {
2222
dependencies {
2323
compile fileTree(dir: "libs", include: ["*.jar"])
2424
compile "com.android.support:appcompat-v7:23.0.1"
25-
compile "com.facebook.react:react-native:0.19.+"
25+
compile "com.facebook.react:react-native:+"
2626
}

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

+118-607
Large diffs are not rendered by default.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package com.microsoft.codepush.react;
2+
3+
public class CodePushConstants {
4+
public static final String ASSETS_BUNDLE_PREFIX = "assets://";
5+
public static final String BINARY_MODIFIED_TIME_KEY = "binaryModifiedTime";
6+
public static final String CODE_PUSH_FOLDER_PREFIX = "CodePush";
7+
public static final String CODE_PUSH_HASH_FILE_NAME = "CodePushHash.json";
8+
public static final String CODE_PUSH_PREFERENCES = "CodePush";
9+
public static final String CURRENT_PACKAGE_KEY = "currentPackage";
10+
public static final String DEFAULT_JS_BUNDLE_NAME = "index.android.bundle";
11+
public static final String DIFF_MANIFEST_FILE_NAME = "hotcodepush.json";
12+
public static final int DOWNLOAD_BUFFER_SIZE = 1024 * 256;
13+
public static final String DOWNLOAD_FILE_NAME = "download.zip";
14+
public static final String DOWNLOAD_PROGRESS_EVENT_NAME = "CodePushDownloadProgress";
15+
public static final String DOWNLOAD_URL_KEY = "downloadUrl";
16+
public static final String FAILED_UPDATES_KEY = "CODE_PUSH_FAILED_UPDATES";
17+
public static final String PACKAGE_FILE_NAME = "app.json";
18+
public static final String PACKAGE_HASH_KEY = "packageHash";
19+
public static final String PENDING_UPDATE_HASH_KEY = "hash";
20+
public static final String PENDING_UPDATE_IS_LOADING_KEY = "isLoading";
21+
public static final String PENDING_UPDATE_KEY = "CODE_PUSH_PENDING_UPDATE";
22+
public static final String PREVIOUS_PACKAGE_KEY = "previousPackage";
23+
public static final String REACT_NATIVE_LOG_TAG = "ReactNative";
24+
public static final String RELATIVE_BUNDLE_PATH_KEY = "bundlePath";
25+
public static final String RESOURCES_BUNDLE = "resources.arsc";
26+
public static final String STATUS_FILE = "codepush.json";
27+
public static final String UNZIPPED_FOLDER_NAME = "unzipped";
28+
}

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

+3-13
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,20 @@
1111

1212
public class CodePushDialog extends ReactContextBaseJavaModule{
1313

14-
private Activity mainActivity;
15-
16-
public CodePushDialog(ReactApplicationContext reactContext, Activity mainActivity) {
14+
public CodePushDialog(ReactApplicationContext reactContext) {
1715
super(reactContext);
18-
this.mainActivity = mainActivity;
1916
}
2017

2118
@ReactMethod
2219
public void showDialog(String title, String message, String button1Text, String button2Text,
2320
final Callback successCallback, Callback errorCallback) {
24-
AlertDialog.Builder builder = new AlertDialog.Builder(mainActivity);
21+
AlertDialog.Builder builder = new AlertDialog.Builder(getCurrentActivity());
2522

2623
builder.setCancelable(false);
2724

2825
DialogInterface.OnClickListener clickListener = new DialogInterface.OnClickListener() {
29-
private boolean callbackConsumed = false;
30-
3126
@Override
32-
public synchronized void onClick(DialogInterface dialog, int which) {
33-
if (callbackConsumed) {
34-
return;
35-
}
36-
37-
callbackConsumed = true;
27+
public void onClick(DialogInterface dialog, int which) {
3828
dialog.cancel();
3929
switch (which) {
4030
case DialogInterface.BUTTON_POSITIVE:

0 commit comments

Comments
 (0)