mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added network info to debug info

This commit is contained in:
M66B 2015-11-14 09:50:45 +01:00
parent 520cc1d4c4
commit 660a830000
2 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/faircode/netguard/ActivitySettings.java
View File

@ -22,6 +22,8 @@ package eu.faircode.netguard;
import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.net.ConnectivityManager;
import android.net.Network;
import android.os.AsyncTask;
import android.os.Bundle;
import android.preference.Preference;
@ -97,6 +99,12 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
if (Util.isDebuggable(this)) {
pref_vpn.setEnabled(INTENT_VPN_SETTINGS.resolveActivity(this.getPackageManager()) != null);
pref_vpn.setIntent(INTENT_VPN_SETTINGS);
ConnectivityManager cm = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
StringBuilder sb = new StringBuilder();
for (Network network : cm.getAllNetworks())
sb.append(cm.getNetworkInfo(network)).append("\n");
pref_vpn.setSummary(sb.toString());
} else
screen.removePreference(pref_vpn);

36
app/src/main/java/eu/faircode/netguard/Util.java
View File

@ -25,6 +25,7 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.net.ConnectivityManager;
import android.net.Network;
import android.net.NetworkInfo;
import android.net.Uri;
import android.os.AsyncTask;
@ -152,21 +153,26 @@ public class Util {
}
StringBuilder sb = new StringBuilder();
sb.insert(0, "\r\n");
sb.insert(0, "Please decribe your problem:\r\n");
sb.insert(0, "\r\n");
sb.insert(0, String.format("VPN dialogs: %b\r\n", isPackageInstalled("com.android.vpndialogs", context)));
sb.insert(0, String.format("Id: %s\r\n", Build.ID));
sb.insert(0, String.format("Display: %s\r\n", Build.DISPLAY));
sb.insert(0, String.format("Host: %s\r\n", Build.HOST));
sb.insert(0, String.format("Device: %s\r\n", Build.DEVICE));
sb.insert(0, String.format("Product: %s\r\n", Build.PRODUCT));
sb.insert(0, String.format("Model: %s\r\n", Build.MODEL));
sb.insert(0, String.format("Manufacturer: %s\r\n", Build.MANUFACTURER));
sb.insert(0, String.format("Brand: %s\r\n", Build.BRAND));
sb.insert(0, "\r\n");
sb.insert(0, String.format("Android: %s (SDK %d)\r\n", Build.VERSION.RELEASE, Build.VERSION.SDK_INT));
sb.insert(0, String.format("NetGuard: %s\r\n", pInfo.versionName + "/" + pInfo.versionCode));
sb.append(String.format("NetGuard: %s\r\n", pInfo.versionName + "/" + pInfo.versionCode));
sb.append(String.format("Android: %s (SDK %d)\r\n", Build.VERSION.RELEASE, Build.VERSION.SDK_INT));
sb.append("\r\n");
sb.append(String.format("Brand: %s\r\n", Build.BRAND));
sb.append(String.format("Manufacturer: %s\r\n", Build.MANUFACTURER));
sb.append(String.format("Model: %s\r\n", Build.MODEL));
sb.append(String.format("Product: %s\r\n", Build.PRODUCT));
sb.append(String.format("Device: %s\r\n", Build.DEVICE));
sb.append(String.format("Host: %s\r\n", Build.HOST));
sb.append(String.format("Display: %s\r\n", Build.DISPLAY));
sb.append(String.format("Id: %s\r\n", Build.ID));
sb.append(String.format("VPN dialogs: %b\r\n", isPackageInstalled("com.android.vpndialogs", context)));
ConnectivityManager cm = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
for (Network network : cm.getAllNetworks())
sb.append("Network: ").append(cm.getNetworkInfo(network)).append("\r\n");
sb.append("\r\n");
sb.append("Please describe your problem:\r\n");
sb.append("\r\n");
Intent sendEmail = new Intent(Intent.ACTION_SEND);
sendEmail.setType("message/rfc822");