diff --git a/briar-android/src/org/briarproject/android/CrashReportActivity.java b/briar-android/src/org/briarproject/android/CrashReportActivity.java index 3bc3c810df301a0ad06dba665e1b9b3ed68788a2..769229d43b801280aaaeba687a43f451b3ec14d3 100644 --- a/briar-android/src/org/briarproject/android/CrashReportActivity.java +++ b/briar-android/src/org/briarproject/android/CrashReportActivity.java @@ -201,16 +201,18 @@ public class CrashReportActivity extends Activity implements OnClickListener { int sdk = Build.VERSION.SDK_INT; statusMap.put("Android version:", release + " (" + sdk + ")"); - // CPU architecture + // CPU architectures 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 { + } else if(Build.VERSION.SDK_INT >= 8) { if(Build.CPU_ABI2 == null) arch = Build.CPU_ABI; else arch = Build.CPU_ABI + ", " + Build.CPU_ABI2; + } else { + arch = Build.CPU_ABI; } statusMap.put("Architecture:", arch); diff --git a/briar-android/src/org/briarproject/plugins/tor/TorPluginFactory.java b/briar-android/src/org/briarproject/plugins/tor/TorPluginFactory.java index fb9c6231b8d9a1e1823ac72eea988008b30f318d..9c49b389cab941b7d607b4a0ff3cad447df35c55 100644 --- a/briar-android/src/org/briarproject/plugins/tor/TorPluginFactory.java +++ b/briar-android/src/org/briarproject/plugins/tor/TorPluginFactory.java @@ -46,9 +46,11 @@ public class TorPluginFactory implements DuplexPluginFactory { List<String> abis = new ArrayList<String>(); if(Build.VERSION.SDK_INT >= 21) { for(String abi : Build.SUPPORTED_ABIS) abis.add(abi); - } else { + } else if(Build.VERSION.SDK_INT >= 8) { abis.add(Build.CPU_ABI); if(Build.CPU_ABI2 != null) abis.add(Build.CPU_ABI2); + } else { + abis.add(Build.CPU_ABI); } boolean supported = false; for(String abi : abis) if(abi.startsWith("armeabi")) supported = true;