Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-12 18:59:06 +01:00
Code Issues Projects Releases Wiki Activity

Refer to manufacturer/model/brand as device type, not device name.

Browse Source
This commit is contained in:
akwizgran
2014-03-10 18:29:35 +00:00
parent 4560cf17ff
commit 4de97ed0ef
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
briar-android/src/org/briarproject/android/TestingActivity.java
View File

@@ -179,15 +179,15 @@ public class TestingActivity extends BriarActivity implements OnClickListener {
private Map<String, String> getStatusMap() { private Map<String, String> getStatusMap() {
Map<String, String> statusMap = new LinkedHashMap<String, String>(); Map<String, String> statusMap = new LinkedHashMap<String, String>();
// Device name // Device type
String deviceName; String deviceType;
String manufacturer = Build.MANUFACTURER; String manufacturer = Build.MANUFACTURER;
String model = Build.MODEL; String model = Build.MODEL;
String brand = Build.BRAND; String brand = Build.BRAND;
if(model.startsWith(manufacturer)) deviceName = capitalize(model); if(model.startsWith(manufacturer)) deviceType = capitalize(model);
else deviceName = capitalize(manufacturer) + " " + model; else deviceType = capitalize(manufacturer) + " " + model;
if(!StringUtils.isNullOrEmpty(brand)) deviceName += " (" + brand + ")"; if(!StringUtils.isNullOrEmpty(brand)) deviceType += " (" + brand + ")";
statusMap.put("Device name:", deviceName); statusMap.put("Device type:", deviceType);
// Android version // Android version
String release = Build.VERSION.RELEASE; String release = Build.VERSION.RELEASE;