From 8ed716dde86c5f3c0dee43f38989ee54e58a0770 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Thu, 6 Mar 2014 16:21:23 +0000
Subject: [PATCH] Added device, OS version and CPU architecture to debugging
info.
---
.../briarproject/android/TestingActivity.java | 27 +++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/briar-android/src/org/briarproject/android/TestingActivity.java b/briar-android/src/org/briarproject/android/TestingActivity.java
index 403b6e3e76..b6eef17be4 100644
--- a/briar-android/src/org/briarproject/android/TestingActivity.java
+++ b/briar-android/src/org/briarproject/android/TestingActivity.java
@@ -57,6 +57,7 @@ import android.net.NetworkInfo;
import android.net.Uri;
import android.net.wifi.WifiManager;
import android.os.AsyncTask;
+import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
import android.view.View;
@@ -177,6 +178,25 @@ public class TestingActivity extends BriarActivity implements OnClickListener {
private Map<String, String> getStatusMap() {
Map<String, String> statusMap = new LinkedHashMap<String, String>();
+
+ // Device name
+ String deviceName;
+ String manufacturer = Build.MANUFACTURER;
+ String model = Build.MODEL;
+ String brand = Build.BRAND;
+ if(model.startsWith(manufacturer)) deviceName = capitalize(model);
+ else deviceName = capitalize(manufacturer) + " " + model;
+ if(!StringUtils.isNullOrEmpty(brand)) deviceName += " (" + brand + ")";
+ statusMap.put("Device name:", deviceName);
+
+ // Android version
+ String release = Build.VERSION.RELEASE;
+ int sdk = Build.VERSION.SDK_INT;
+ statusMap.put("Android version:", release + " (" + sdk + ")");
+
+ // CPU architecture
+ statusMap.put("Architecture:", Build.CPU_ABI);
+
// Is mobile data available?
Object o = getSystemService(CONNECTIVITY_SERVICE);
ConnectivityManager cm = (ConnectivityManager) o;
@@ -323,6 +343,13 @@ public class TestingActivity extends BriarActivity implements OnClickListener {
return Collections.unmodifiableMap(statusMap);
}
+ private String capitalize(String s) {
+ if(StringUtils.isNullOrEmpty(s)) return s;
+ char first = s.charAt(0);
+ if(Character.isUpperCase(first)) return s;
+ return Character.toUpperCase(first) + s.substring(1);
+ }
+
private void share() {
scroll.setVisibility(GONE);
progress.setVisibility(VISIBLE);
--
GitLab