MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-12-02 06:52:55 +01:00
Code Releases Wiki Activity

Fix duplicate BroadcastReceiver/webview issue

Browse Source
This commit is contained in:
Gordon Williams 2022-03-25 08:24:44 +00:00
parent 2413f07741
commit 8836d1a71c
1 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/banglejs/AppsManagementActivity.java
View File

@ -45,29 +45,12 @@ import nodomain.freeyourgadget.gadgetbridge.util.GB;
public class AppsManagementActivity extends AbstractGBActivity { public class AppsManagementActivity extends AbstractGBActivity {
private static final Logger LOG = LoggerFactory.getLogger(AppsManagementActivity.class); private static final Logger LOG = LoggerFactory.getLogger(AppsManagementActivity.class);
private final BroadcastReceiver commandReceiver;
private WebView webView; private WebView webView;
private GBDevice mGBDevice; private GBDevice mGBDevice;
private DeviceCoordinator mCoordinator; private DeviceCoordinator mCoordinator;
public AppsManagementActivity() { public AppsManagementActivity() {
IntentFilter commandFilter = new IntentFilter();
commandFilter.addAction(BangleJSDeviceSupport.BANGLEJS_COMMAND_RX);
commandReceiver = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
switch (intent.getAction()) {
case BangleJSDeviceSupport.BANGLEJS_COMMAND_RX: {
String data = String.valueOf(intent.getExtras().get("DATA"));
LOG.info("WebView TX: " + data);
bangleRxData(data);
break;
}
}
}
};
LocalBroadcastManager.getInstance(GBApplication.getContext()).registerReceiver(commandReceiver, commandFilter);
} }
@Override @Override
@ -83,8 +66,6 @@ public class AppsManagementActivity extends AbstractGBActivity {
throw new IllegalArgumentException("Must provide a device when invoking this activity"); throw new IllegalArgumentException("Must provide a device when invoking this activity");
} }
mCoordinator = DeviceHelper.getInstance().getCoordinator(mGBDevice); mCoordinator = DeviceHelper.getInstance().getCoordinator(mGBDevice);
initViews();
} }
private void toast(String data) { private void toast(String data) {
@ -94,6 +75,8 @@ public class AppsManagementActivity extends AbstractGBActivity {
@Override @Override
protected void onPause() { protected void onPause() {
super.onPause(); super.onPause();
webView.destroy();
webView = null;
LocalBroadcastManager.getInstance(this).unregisterReceiver(deviceUpdateReceiver); LocalBroadcastManager.getInstance(this).unregisterReceiver(deviceUpdateReceiver);
finish(); finish();
} }
@ -101,13 +84,25 @@ public class AppsManagementActivity extends AbstractGBActivity {
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
LocalBroadcastManager.getInstance(this).registerReceiver(deviceUpdateReceiver, new IntentFilter(GBDevice.ACTION_DEVICE_CHANGED)); IntentFilter commandFilter = new IntentFilter();
commandFilter.addAction(GBDevice.ACTION_DEVICE_CHANGED);
commandFilter.addAction(BangleJSDeviceSupport.BANGLEJS_COMMAND_RX);
LocalBroadcastManager.getInstance(this).registerReceiver(deviceUpdateReceiver, commandFilter);
initViews();
} }
BroadcastReceiver deviceUpdateReceiver = new BroadcastReceiver() { BroadcastReceiver deviceUpdateReceiver = new BroadcastReceiver() {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
switch (intent.getAction()) {
case BangleJSDeviceSupport.BANGLEJS_COMMAND_RX: {
String data = String.valueOf(intent.getExtras().get("DATA"));
LOG.info("WebView TX: " + data);
bangleRxData(data);
break;
}
}
} }
}; };
@ -134,7 +129,7 @@ public class AppsManagementActivity extends AbstractGBActivity {
String ss = s.toString(); String ss = s.toString();
final String js = "bangleRx("+ss.substring(1, ss.length()-1)+");"; final String js = "bangleRx("+ss.substring(1, ss.length()-1)+");";
LOG.info("WebView TX cmd: " + js); LOG.info("WebView TX cmd: " + js);
webView.post(new Runnable() { if (webView!=null) webView.post(new Runnable() {
@Override @Override
public void run() { public void run() {
if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) { if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {