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

Add ABI to logcat

This commit is contained in:
M66B 2016-01-10 08:48:01 +01:00
parent 0d1a4d8f2f
commit 877a801c8a
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -345,6 +345,15 @@ public class Util {
return Math.round(dips * context.getResources().getDisplayMetrics().density + 0.5f); return Math.round(dips * context.getResources().getDisplayMetrics().density + 0.5f);
} }
public static String md5(String text, String salt) throws NoSuchAlgorithmException, UnsupportedEncodingException {
// MD5
byte[] bytes = MessageDigest.getInstance("MD5").digest((text + salt).getBytes("UTF-8"));
StringBuilder sb = new StringBuilder();
for (byte b : bytes)
sb.append(String.format("%02X", b));
return sb.toString();
}
public static void logExtras(Intent intent) { public static void logExtras(Intent intent) {
if (intent != null) if (intent != null)
logBundle(intent.getExtras()); logBundle(intent.getExtras());
@ -547,15 +556,6 @@ public class Util {
return sb.toString(); return sb.toString();
} }
public static String md5(String text, String salt) throws NoSuchAlgorithmException, UnsupportedEncodingException {
// MD5
byte[] bytes = MessageDigest.getInstance("MD5").digest((text + salt).getBytes("UTF-8"));
StringBuilder sb = new StringBuilder();
for (byte b : bytes)
sb.append(String.format("%02X", b));
return sb.toString();
}
public static void sendLogcat(final Uri uri, final Context context) { public static void sendLogcat(final Uri uri, final Context context) {
AsyncTask task = new AsyncTask<Object, Object, Intent>() { AsyncTask task = new AsyncTask<Object, Object, Intent>() {
@Override @Override
@ -576,6 +576,14 @@ public class Util {
sb.append(String.format("Display: %s\r\n", Build.DISPLAY)); sb.append(String.format("Display: %s\r\n", Build.DISPLAY));
sb.append(String.format("Id: %s\r\n", Build.ID)); sb.append(String.format("Id: %s\r\n", Build.ID));
sb.append(String.format("Fingerprint: %B\r\n", hasValidFingerprint(context))); sb.append(String.format("Fingerprint: %B\r\n", hasValidFingerprint(context)));
String abi;
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP)
abi = Build.CPU_ABI;
else
abi = (Build.SUPPORTED_ABIS.length > 0 ? Build.SUPPORTED_ABIS[0] : "?");
sb.append(String.format("ABI: %s\r\n", abi));
sb.append("\r\n"); sb.append("\r\n");
sb.append(String.format("VPN dialogs: %B\r\n", isPackageInstalled("com.android.vpndialogs", context))); sb.append(String.format("VPN dialogs: %B\r\n", isPackageInstalled("com.android.vpndialogs", context)));