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

Use JDK 1.7, target Android 5.1.

Browse Source
This commit is contained in:
akwizgran
2015-04-03 20:56:01 +01:00
parent 10924709d0
commit a1d2aaf10e
9 changed files with 53 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
briar-android/src/org/briarproject/android/CrashReportActivity.java
View File

@@ -154,10 +154,12 @@ public class CrashReportActivity extends Activity implements OnClickListener {
progress.setVisibility(VISIBLE);
new AsyncTask<Void, Void, Map<String, String>>() {
@Override
protected Map<String, String> doInBackground(Void... args) {
return getStatusMap();
}
@Override
protected void onPostExecute(Map<String, String> result) {
Context ctx = CrashReportActivity.this;
int pad = LayoutUtils.getPadding(ctx);
@@ -179,6 +181,7 @@ public class CrashReportActivity extends Activity implements OnClickListener {
// FIXME: Load strings from resources if we're keeping this activity
@SuppressLint("NewApi")
@SuppressWarnings("deprecation")
private Map<String, String> getStatusMap() {
Map<String, String> statusMap = new LinkedHashMap<String, String>();
@@ -199,7 +202,17 @@ public class CrashReportActivity extends Activity implements OnClickListener {
statusMap.put("Android version:", release + " (" + sdk + ")");
// CPU architecture
statusMap.put("Architecture:", Build.CPU_ABI);
String arch = null;
if(Build.VERSION.SDK_INT >= 21) {
for(String abi : Build.SUPPORTED_ABIS) {
if(arch == null) arch = abi;
else arch = arch + ", " + abi;
}
} else {
if(Build.CPU_ABI2 == null) arch = Build.CPU_ABI;
else arch = Build.CPU_ABI + ", " + Build.CPU_ABI2;
}
statusMap.put("Architecture:", arch);
// System memory
Object o = getSystemService(ACTIVITY_SERVICE);
@@ -392,10 +405,12 @@ public class CrashReportActivity extends Activity implements OnClickListener {
private void share() {
new AsyncTask<Void, Void, Map<String, String>>() {
@Override
protected Map<String, String> doInBackground(Void... args) {
return getStatusMap();
}
@Override
protected void onPostExecute(Map<String, String> result) {
try {
File shared = Environment.getExternalStorageDirectory();