CodeCow/PCAPdroid
1
0
Fork 0
mirror of https://github.com/emanuele-f/PCAPdroid.git synced 2026-07-03 21:21:12 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Promote the firewall feature

Browse Source
This commit is contained in:
emanuele-f 2022-08-25 12:12:52 +02:00
parent cff4639bd6
commit 5abf151f16
2 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
app/src/main/java/com/emanuelef/remote_capture/fragments/ConnectionsFragment.java
View File

@ -20,6 +20,7 @@
package com.emanuelef.remote_capture.fragments;
import android.app.Activity;
import android.app.AlertDialog;
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.Intent;
@ -293,7 +294,10 @@ public class ConnectionsFragment extends Fragment implements ConnectionsListener
Context ctx = requireContext();
MenuItem item;
boolean firewallAvailable = Billing.newInstance(ctx).isFirewallVisible();
Billing billing = Billing.newInstance(ctx);
boolean firewallVisible = billing.isFirewallVisible();
boolean showPurchaseFirewall = (!billing.isPurchased(Billing.FIREWALL_SKU) && billing.isAvailable(Billing.FIREWALL_SKU)) && !CaptureService.isCapturingAsRoot();
boolean blockVisible = false;
boolean unblockVisible = false;
Blocklist blocklist = PCAPdroid.getInstance().getBlocklist();
@ -426,8 +430,8 @@ public class ConnectionsFragment extends Fragment implements ConnectionsListener
menu.findItem(R.id.hide_proto).setTitle(label);
menu.findItem(R.id.search_proto).setTitle(label);
menu.findItem(R.id.block_menu).setVisible(firewallAvailable && blockVisible);
menu.findItem(R.id.unblock_menu).setVisible(firewallAvailable && unblockVisible);
menu.findItem(R.id.block_menu).setVisible((firewallVisible || showPurchaseFirewall) && blockVisible);
menu.findItem(R.id.unblock_menu).setVisible(firewallVisible && unblockVisible);
if(!conn.isBlacklisted())
menu.findItem(R.id.whitelist_menu).setVisible(false);
@ -439,6 +443,7 @@ public class ConnectionsFragment extends Fragment implements ConnectionsListener
ConnectionDescriptor conn = mAdapter.getSelectedItem();
MatchList whitelist = PCAPdroid.getInstance().getMalwareWhitelist();
Blocklist blocklist = PCAPdroid.getInstance().getBlocklist();
boolean firewallPurchased = Billing.newInstance(ctx).isPurchased(Billing.FIREWALL_SKU);
boolean mask_changed = false;
boolean whitelist_changed = false;
boolean blocklist_changed = false;
@ -485,17 +490,29 @@ public class ConnectionsFragment extends Fragment implements ConnectionsListener
whitelist.addHost(conn.info);
whitelist_changed = true;
} else if(id == R.id.block_app) {
blocklist.addApp(conn.uid);
blocklist_changed = true;
if(firewallPurchased) {
blocklist.addApp(conn.uid);
blocklist_changed = true;
} else
showFirewallPurchaseDialog();
} else if(id == R.id.block_ip) {
blocklist.addIp(conn.dst_ip);
blocklist_changed = true;
if(firewallPurchased) {
blocklist.addIp(conn.dst_ip);
blocklist_changed = true;
} else
showFirewallPurchaseDialog();
} else if(id == R.id.block_host) {
blocklist.addHost(conn.info);
blocklist_changed = true;
if(firewallPurchased) {
blocklist.addHost(conn.info);
blocklist_changed = true;
} else
showFirewallPurchaseDialog();
} else if(id == R.id.block_domain) {
blocklist.addHost(Utils.getSecondLevelDomain(conn.info));
blocklist_changed = true;
if(firewallPurchased) {
blocklist.addHost(Utils.getSecondLevelDomain(conn.info));
blocklist_changed = true;
} else
showFirewallPurchaseDialog();
} else if(id == R.id.unblock_app_permanently) {
blocklist.removeApp(conn.uid);
blocklist_changed = true;
@ -544,6 +561,17 @@ public class ConnectionsFragment extends Fragment implements ConnectionsListener
return true;
}
private void showFirewallPurchaseDialog() {
new AlertDialog.Builder(requireContext())
.setTitle(R.string.paid_feature)
.setMessage(Utils.getText(requireContext(), R.string.firewall_purchase_msg, getString(R.string.no_root_firewall)))
.setPositiveButton(R.string.show_me, (dialogInterface, i) -> {
// Billing code here
})
.setNegativeButton(R.string.cancel_action, (dialogInterface, i) -> {})
.show();
}
private void setQuery(String query) {
Utils.setSearchQuery(mSearchView, mMenuItemSearch, query);
}

2
app/src/main/res/values/strings.xml
View File

@ -408,4 +408,6 @@
<string name="requesting_unlock_token">Requesting an unlock token, please wait</string>
<string name="show_action">Show</string>
<string name="unlock_token_msg1">This is your unlock token. Note it down as you will need it <a href='%1$s'>to generate your license codes</a></string>
<string name="paid_feature">Paid feature</string>
<string name="firewall_purchase_msg">Buy the <i>%1$s</i> feature to start blocking connections</string>
</resources>