Merge branch 'master' of github.com:Microsoft/react-native-code-push into report-acquisition-status

This commit is contained in:
Geoffrey Goh
2016-01-22 12:55:36 -08:00
3 changed files with 66 additions and 15 deletions

View File

@@ -3,7 +3,6 @@ package com.microsoft.codepush.react;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.support.v4.app.FragmentActivity;
import com.facebook.react.bridge.Callback;
import com.facebook.react.bridge.ReactApplicationContext;
@@ -22,16 +21,7 @@ public class CodePushDialog extends ReactContextBaseJavaModule{
@ReactMethod
public void showDialog(String title, String message, String button1Text, String button2Text,
final Callback successCallback, Callback errorCallback) {
FragmentActivity fragmentActivity = null;
try {
fragmentActivity = (FragmentActivity) mainActivity;
} catch (ClassCastException e) {
errorCallback.invoke("Unable to show dialog, main activity is not a FragmentActivity");
return;
}
AlertDialog.Builder builder = new AlertDialog.Builder(fragmentActivity);
AlertDialog.Builder builder = new AlertDialog.Builder(mainActivity);
builder.setCancelable(false);