Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import android.content.Intent;
import android.os.Bundle;
import android.webkit.WebView;
import com.getcapacitor.CordovaBridgeConfig;
import com.getcapacitor.Logger;
import com.getcapacitor.Plugin;
import com.getcapacitor.annotation.CapacitorPlugin;
Expand All @@ -16,7 +17,7 @@
import org.json.JSONException;

@CapacitorPlugin(name = "__CordovaPlugin")
public class CordovaPlugin extends Plugin {
public class CordovaPlugin extends Plugin implements CordovaBridgeConfig {

private MockCordovaInterfaceImpl cordovaInterface;
private CordovaWebView webView;
Expand Down Expand Up @@ -83,16 +84,13 @@ protected void handleRequestPermissionsResult(int requestCode, String[] permissi
}

@Override
public boolean hasPermission(String permission) {
if (permission.equals("DisableDeploy")) {
return preferences.getBoolean(permission, false);
}

if (permission.equals("KeepRunning")) {
return preferences.getBoolean(permission, true);
}
public boolean shouldKeepRunning() {
return preferences.getBoolean("KeepRunning", true);
}

return false;
@Override
public boolean isDeployDisabled() {
return preferences.getBoolean("DisableDeploy", false);
}

@Override
Expand Down
18 changes: 8 additions & 10 deletions android/capacitor/src/main/java/com/getcapacitor/Bridge.java
Original file line number Diff line number Diff line change
Expand Up @@ -379,22 +379,20 @@ private Plugin cordova() {
return null;
}

public boolean isDeployDisabled() {
public boolean shouldKeepRunning() {
Plugin cordova = this.cordova();
if (cordova != null) {
return cordova.hasPermission("DisableDeploy");
} else {
return false;
if (cordova instanceof CordovaBridgeConfig) {
return ((CordovaBridgeConfig) cordova).shouldKeepRunning();
}
return false;
}

public boolean shouldKeepRunning() {
public boolean isDeployDisabled() {
Plugin cordova = this.cordova();
if (cordova != null) {
return cordova.hasPermission("KeepRunning");
} else {
return false;
if (cordova instanceof CordovaBridgeConfig) {
return ((CordovaBridgeConfig) cordova).isDeployDisabled();
}
return false;
}

public void handleAppUrlLoadError(Exception ex) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.getcapacitor;

public interface CordovaBridgeConfig {
boolean isDeployDisabled();
boolean shouldKeepRunning();
}
Loading