From 2c6d73077d2192764db125961935868782363b6a Mon Sep 17 00:00:00 2001 From: Tobrun Date: Thu, 25 Oct 2018 14:15:18 +0200 Subject: [android] - remove java 8 language features --- platform/android/MapboxGLAndroidSDK/build.gradle | 5 ---- .../mapbox/mapboxsdk/http/LocalRequestTask.java | 22 ++++++++++++--- .../mapbox/mapboxsdk/http/NativeHttpRequest.java | 15 ++++++---- .../main/java/com/mapbox/mapboxsdk/log/Logger.java | 20 +++++++++++++- .../com/mapbox/mapboxsdk/log/LoggerDefinition.java | 32 ---------------------- .../mapbox/mapboxsdk/offline/OfflineManager.java | 10 +++---- .../style/sources/CustomGeometrySource.java | 2 +- 7 files changed, 52 insertions(+), 54 deletions(-) diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle index 843836eb3b..8143adcc36 100644 --- a/platform/android/MapboxGLAndroidSDK/build.gradle +++ b/platform/android/MapboxGLAndroidSDK/build.gradle @@ -118,11 +118,6 @@ android { main.res.srcDirs += 'src/main/res-public' } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 - } - lintOptions { disable 'MissingTranslation', 'TypographyQuotes', 'ObsoleteLintCustomCheck', 'MissingPermission', 'WrongThreadInterprocedural' checkAllWarnings true diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/LocalRequestTask.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/LocalRequestTask.java index 7884033de7..1c2ed01945 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/LocalRequestTask.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/LocalRequestTask.java @@ -39,18 +39,32 @@ class LocalRequestTask extends AsyncTask { private static byte[] loadFile(AssetManager assets, String path) { byte[] buffer = null; - try (InputStream input = assets.open(path)) { + InputStream input = null; + try { + input = assets.open(path); int size = input.available(); buffer = new byte[size]; input.read(buffer); } catch (IOException exception) { - String message = "Load file failed"; - Logger.e(TAG, message, exception); - MapStrictMode.strictModeViolation(message, exception); + logFileError(exception); + } finally { + if (input != null) { + try { + input.close(); + } catch (IOException exception) { + logFileError(exception); + } + } } return buffer; } + private static void logFileError(Exception exception) { + String message = "Load file failed"; + Logger.e(TAG, message, exception); + MapStrictMode.strictModeViolation(message, exception); + } + public interface OnLocalRequestResponse { void onResponse(byte[] bytes); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/NativeHttpRequest.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/NativeHttpRequest.java index 5de90b1d67..14dbfeaee3 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/NativeHttpRequest.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/http/NativeHttpRequest.java @@ -58,13 +58,16 @@ public class NativeHttpRequest implements HttpResponder { } private void executeLocalRequest(String resourceUrl) { - new LocalRequestTask(bytes -> { - if (bytes != null) { - lock.lock(); - if (nativePtr != 0) { - nativeOnResponse(200, null, null, null, null, null, null, bytes); + new LocalRequestTask(new LocalRequestTask.OnLocalRequestResponse() { + @Override + public void onResponse(byte[] bytes) { + if (bytes != null) { + lock.lock(); + if (nativePtr != 0) { + NativeHttpRequest.this.nativeOnResponse(200, null, null, null, null, null, null, bytes); + } + lock.unlock(); } - lock.unlock(); } }).execute(resourceUrl); } diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/Logger.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/Logger.java index fe443b81aa..4a262a8529 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/Logger.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/Logger.java @@ -201,6 +201,24 @@ public final class Logger { * @param message The message you would like logged. */ public static void log(int severity, String tag, String message) { - LoggerDefinition.log(severity, tag, message); + switch (severity) { + case Log.VERBOSE: + Logger.v(tag, message); + break; + case Log.DEBUG: + Logger.d(tag, message); + break; + case Log.INFO: + Logger.i(tag, message); + break; + case Log.WARN: + Logger.w(tag, message); + break; + case Log.ERROR: + Logger.e(tag, message); + break; + default: + throw new UnsupportedOperationException(); + } } } \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/LoggerDefinition.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/LoggerDefinition.java index 27de7349f8..60b6eb0009 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/LoggerDefinition.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/log/LoggerDefinition.java @@ -1,7 +1,5 @@ package com.mapbox.mapboxsdk.log; -import android.util.Log; - /** * Definition of a logger for the Mapbox Maps SDK for Android. */ @@ -101,34 +99,4 @@ public interface LoggerDefinition { * @param tr An exception to log */ void e(String tag, String msg, Throwable tr); - - /** - * Send a log message based on severity. - * - * @param severity the log severity - * @param tag Used to identify the source of a log message. It usually identifies - * the class or activity where the log call occurs. - * @param message The message you would like logged. - */ - static void log(int severity, String tag, String message) { - switch (severity) { - case Log.VERBOSE: - Logger.v(tag, message); - break; - case Log.DEBUG: - Logger.d(tag, message); - break; - case Log.INFO: - Logger.i(tag, message); - break; - case Log.WARN: - Logger.w(tag, message); - break; - case Log.ERROR: - Logger.e(tag, message); - break; - default: - throw new UnsupportedOperationException(); - } - } } \ No newline at end of file diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java index c70db4f717..bfe50b9c61 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/offline/OfflineManager.java @@ -237,7 +237,7 @@ public class OfflineManager { * @param callback completion/error callback */ public void mergeOfflineRegions(@NonNull String path, @NonNull final MergeOfflineRegionsCallback callback) { - File src = new File(path); + final File src = new File(path); new FileUtils.CheckFileReadPermissionTask(new FileUtils.OnCheckFileReadPermissionListener() { @Override public void onReadPermissionGranted() { @@ -329,12 +329,12 @@ public class OfflineManager { } } - private void mergeOfflineDatabaseFiles(@NonNull File file, @NonNull final MergeOfflineRegionsCallback callback, - boolean isTemporaryFile) { + private void mergeOfflineDatabaseFiles(@NonNull final File file, @NonNull final MergeOfflineRegionsCallback callback, + final boolean isTemporaryFile) { fileSource.activate(); mergeOfflineRegions(fileSource, file.getAbsolutePath(), new MergeOfflineRegionsCallback() { @Override - public void onMerge(OfflineRegion[] offlineRegions) { + public void onMerge(final OfflineRegion[] offlineRegions) { getHandler().post(new Runnable() { @Override public void run() { @@ -348,7 +348,7 @@ public class OfflineManager { } @Override - public void onError(String error) { + public void onError(final String error) { getHandler().post(new Runnable() { @Override public void run() { diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySource.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySource.java index a44d7cab1a..8aef5bc2ac 100644 --- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySource.java +++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/style/sources/CustomGeometrySource.java @@ -230,7 +230,7 @@ public class CustomGeometrySource extends Source { } executor = new ThreadPoolExecutor(THREAD_POOL_LIMIT, THREAD_POOL_LIMIT, - 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>(), + 0L, TimeUnit.MILLISECONDS, new LinkedBlockingQueue(), new ThreadFactory() { final AtomicInteger threadCount = new AtomicInteger(); final int poolId = poolCount.getAndIncrement(); -- cgit v1.2.1