From 4de97ed0ef8bd757dcf1292077f4a88afe2dcafe Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Mon, 10 Mar 2014 18:29:35 +0000
Subject: [PATCH] Refer to manufacturer/model/brand as device type, not device
name.
---
.../org/briarproject/android/TestingActivity.java | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/briar-android/src/org/briarproject/android/TestingActivity.java b/briar-android/src/org/briarproject/android/TestingActivity.java
index d28027cc18..e3990669d5 100644
--- a/briar-android/src/org/briarproject/android/TestingActivity.java
+++ b/briar-android/src/org/briarproject/android/TestingActivity.java
@@ -179,15 +179,15 @@ public class TestingActivity extends BriarActivity implements OnClickListener {
private Map<String, String> getStatusMap() {
Map<String, String> statusMap = new LinkedHashMap<String, String>();
- // Device name
- String deviceName;
+ // Device type
+ String deviceType;
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);
+ if(model.startsWith(manufacturer)) deviceType = capitalize(model);
+ else deviceType = capitalize(manufacturer) + " " + model;
+ if(!StringUtils.isNullOrEmpty(brand)) deviceType += " (" + brand + ")";
+ statusMap.put("Device type:", deviceType);
// Android version
String release = Build.VERSION.RELEASE;
--
GitLab