Skip to content

Fix IntentLeak using plugin with background service #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marcolettieri wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Fix IntentLeak using plugin with background service #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67c2069
Update WifiDelegate.java
marcolettieri Jan 8, 2020
7b62cc2
Update WifiPlugin.java
marcolettieri Jan 8, 2020
f31ed4d
Update WifiDelegate.java
marcolettieri Jan 8, 2020
d64adf8
Update WifiPlugin.java
marcolettieri Jan 8, 2020
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
26 changes: 24 additions & 2 deletions android/src/main/java/com/ly/wifi/WifiDelegate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import android.net.wifi.WifiInfo;
import android.net.wifi.WifiManager;
import android.os.Build;

import android.content.IntentFilter;
import androidx.core.app.ActivityCompat;

import java.net.Inet4Address;
Expand Down Expand Up @@ -335,7 +335,7 @@ private void clearMethodCallAndResult() {
public class NetworkChangeReceiver extends BroadcastReceiver {
private int netId;
private boolean willLink = false;

public boolean isRegistered;
@Override
public void onReceive(Context context, Intent intent) {
NetworkInfo info = intent.getParcelableExtra(ConnectivityManager.EXTRA_NETWORK_INFO);
Expand All @@ -347,6 +347,28 @@ public void onReceive(Context context, Intent intent) {
clearMethodCallAndResult();
}
}
public Intent register(Context context, IntentFilter filter) {
try {
return !isRegistered
? context.registerReceiver(this, filter)
: null;
} finally {
isRegistered = true;
}
}
public boolean unregister(Context context) {
// additional work match on context before unregister
// eg store weak ref in register then compare in unregister
// if match same instance
return isRegistered
&& unregisterInternal(context);
}

private boolean unregisterInternal(Context context) {
context.unregisterReceiver(this);
isRegistered = false;
return true;
}

public void connect(int netId) {
this.netId = netId;
Expand Down
5 changes: 1 addition & 4 deletions android/src/main/java/com/ly/wifi/WifiPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@ public static void registerWith(Registrar registrar) {
IntentFilter filter = new IntentFilter();
filter.addAction(WifiManager.NETWORK_STATE_CHANGED_ACTION);
filter.addAction(ConnectivityManager.CONNECTIVITY_ACTION);
registrar
.context()
.registerReceiver(delegate.networkReceiver,filter);

delegate.networkReceiver.register(registrar.context(),filter);
channel.setMethodCallHandler(new WifiPlugin(registrar, delegate));
}

Expand Down