Refactor CodePushDialog to extend BaseJavaModule and improve activity retrieval logic

Author: hebertcisco

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

@@ -4,13 +4,13 @@
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 
+import com.facebook.react.bridge.BaseJavaModule;
 import com.facebook.react.bridge.Callback;
 import com.facebook.react.bridge.LifecycleEventListener;
 import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 
-public class CodePushDialog extends ReactContextBaseJavaModule{
+public class CodePushDialog extends BaseJavaModule {
 
     public CodePushDialog(ReactApplicationContext reactContext) {
         super(reactContext);
@@ -19,14 +19,14 @@ public CodePushDialog(ReactApplicationContext reactContext) {
     @ReactMethod
     public void showDialog(final String title, final String message, final String button1Text,
                            final String button2Text, final Callback successCallback, Callback errorCallback) {
-        Activity currentActivity = getCurrentActivity();
+        Activity currentActivity = getReactApplicationContext().getCurrentActivity();
         if (currentActivity == null || currentActivity.isFinishing()) {
             // If getCurrentActivity is null, it could be because the app is backgrounded,
             // so we show the dialog when the app resumes)
             getReactApplicationContext().addLifecycleEventListener(new LifecycleEventListener() {
                 @Override
                 public void onHostResume() {
-                    Activity currentActivity = getCurrentActivity();
+                    Activity currentActivity = getReactApplicationContext().getCurrentActivity();
                     if (currentActivity != null) {
                         getReactApplicationContext().removeLifecycleEventListener(this);
                         showDialogInternal(title, message, button1Text, button2Text, successCallback, currentActivity);