From 9e3db12ea2242137f7c43c2b2bc9b510cf01d69e Mon Sep 17 00:00:00 2001 From: akwizgran Date: Tue, 27 Sep 2016 11:44:14 +0100 Subject: [PATCH 1/2] Recreate the cache dir after deleting app data. --- .../src/org/briarproject/android/util/AndroidUtils.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/briar-android/src/org/briarproject/android/util/AndroidUtils.java b/briar-android/src/org/briarproject/android/util/AndroidUtils.java index 319c1854f..325bfbd07 100644 --- a/briar-android/src/org/briarproject/android/util/AndroidUtils.java +++ b/briar-android/src/org/briarproject/android/util/AndroidUtils.java @@ -108,6 +108,8 @@ public class AndroidUtils { IoUtils.deleteFileOrDir(child); } } + // Recreate the cache dir as some OpenGL drivers expect it to exist + new File(dataDir, "cache").mkdir(); } public static File getReportDir(Context ctx) { From 133722dd2c25715ec7fc87fa3ac1d1908af80ad4 Mon Sep 17 00:00:00 2001 From: akwizgran Date: Tue, 27 Sep 2016 11:51:24 +0100 Subject: [PATCH 2/2] Code cleanup. --- .../android/util/AndroidUtils.java | 24 +++++++------------ 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/briar-android/src/org/briarproject/android/util/AndroidUtils.java b/briar-android/src/org/briarproject/android/util/AndroidUtils.java index 325bfbd07..ee6997f2e 100644 --- a/briar-android/src/org/briarproject/android/util/AndroidUtils.java +++ b/briar-android/src/org/briarproject/android/util/AndroidUtils.java @@ -1,6 +1,5 @@ package org.briarproject.android.util; -import android.annotation.SuppressLint; import android.bluetooth.BluetoothAdapter; import android.content.Context; import android.os.Build; @@ -53,10 +52,9 @@ public class AndroidUtils { private static final String STORED_REPORTS = "dev-reports"; - @SuppressLint("NewApi") @SuppressWarnings("deprecation") public static Collection getSupportedArchitectures() { - List abis = new ArrayList(); + List abis = new ArrayList<>(); if (Build.VERSION.SDK_INT >= 21) { abis.addAll(Arrays.asList(Build.SUPPORTED_ABIS)); } else { @@ -67,17 +65,12 @@ public class AndroidUtils { } public static void setError(TextInputLayout til, String error, - boolean condition) { - if (condition) { - if (til.getError() == null) - til.setError(error); - } else + boolean set) { + if (set) { + if (til.getError() == null) til.setError(error); + } else { til.setError(null); - } - - public static void setError(TextInputLayout til, int res, - boolean condition) { - setError(til, til.getContext().getString(res), condition); + } } public static String getBluetoothAddress(Context ctx, @@ -128,9 +121,8 @@ public class AndroidUtils { MIN_RESOLUTION, WEEK_IN_MILLIS, flags).toString(); } // otherwise just show "...ago" or date string - return DateUtils - .getRelativeTimeSpanString(time, System.currentTimeMillis(), - MIN_RESOLUTION, flags).toString(); + return DateUtils.getRelativeTimeSpanString(time, + System.currentTimeMillis(), MIN_RESOLUTION, flags).toString(); } public static SpannableStringBuilder getTeaser(Context ctx, Spanned body) {