refactor(android): require AppCompatActivity in Bridge (#3883)

Co-authored-by: Carl Poole <[email protected]>
ionic-team · Dec 1, 2020 · b883af4 · b883af4
1 parent b417278
commit b883af4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/android/capacitor/src/main/java/com/getcapacitor/Bridge.java b/android/capacitor/src/main/java/com/getcapacitor/Bridge.java
@@ -16,6 +16,7 @@
 import android.webkit.ValueCallback;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
 import com.getcapacitor.android.R;
 import com.getcapacitor.annotation.CapacitorPlugin;
@@ -79,7 +80,7 @@ public class Bridge {
     private CapConfig config;
 
     // A reference to the main activity for the app
-    private final Activity context;
+    private final AppCompatActivity context;
     private WebViewLocalServer localServer;
     private String localUrl;
     private String appUrl;
@@ -129,7 +130,7 @@ public class Bridge {
      */
     @Deprecated
     public Bridge(
-        Activity context,
+        AppCompatActivity context,
         WebView webView,
         List<Class<? extends Plugin>> initialPlugins,
         MockCordovaInterfaceImpl cordovaInterface,
@@ -324,7 +325,7 @@ public Context getContext() {
      * Get the activity for the app
      * @return
      */
-    public Activity getActivity() {
+    public AppCompatActivity getActivity() {
         return this.context;
     }
 
@@ -1096,11 +1097,11 @@ public static class Builder {
         private Bundle instanceState = null;
         private JSONObject config = new JSONObject();
         private List<Class<? extends Plugin>> plugins = new ArrayList<>();
-        private Activity activity = null;
+        private AppCompatActivity activity = null;
         private Context context = null;
         private WebView webView = null;
 
-        protected Builder setActivity(Activity activity) {
+        protected Builder setActivity(AppCompatActivity activity) {
             this.activity = activity;
             this.context = activity.getApplicationContext();
             this.webView = activity.findViewById(R.id.webview);

diff --git a/android/capacitor/src/main/java/com/getcapacitor/BridgeFragment.java b/android/capacitor/src/main/java/com/getcapacitor/BridgeFragment.java
@@ -7,6 +7,7 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
 import com.getcapacitor.android.R;
 import java.util.ArrayList;
@@ -62,7 +63,12 @@ protected void load(Bundle savedInstanceState) {
             startDir = getArguments().getString(ARG_START_DIR);
         }
 
-        bridge = new Bridge.Builder().setActivity(getActivity()).setInstanceState(savedInstanceState).setPlugins(initialPlugins).create();
+        bridge =
+            new Bridge.Builder()
+                .setActivity((AppCompatActivity) getActivity())
+                .setInstanceState(savedInstanceState)
+                .setPlugins(initialPlugins)
+                .create();
 
         if (startDir != null) {
             bridge.setServerAssetPath(startDir);

diff --git a/android/capacitor/src/main/java/com/getcapacitor/Plugin.java b/android/capacitor/src/main/java/com/getcapacitor/Plugin.java
@@ -85,7 +85,7 @@ public Context getContext() {
      * @return the Activity for the current app
      */
     public AppCompatActivity getActivity() {
-        return (AppCompatActivity) this.bridge.getActivity();
+        return this.bridge.getActivity();
     }
 
     /**