From d8a3812f77dc7d91fbab41c09236bd352127dd76 Mon Sep 17 00:00:00 2001 From: Paul Peavyhouse Date: Mon, 11 Mar 2019 16:07:15 -0700 Subject: [PATCH 1/3] Allow override of Build.VERSION.SDK_INT (could help with compatibility) --- .../v18/scanner/BluetoothLeScannerCompat.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/scanner/src/main/java/no/nordicsemi/android/support/v18/scanner/BluetoothLeScannerCompat.java b/scanner/src/main/java/no/nordicsemi/android/support/v18/scanner/BluetoothLeScannerCompat.java index ea0637d..ec89228 100644 --- a/scanner/src/main/java/no/nordicsemi/android/support/v18/scanner/BluetoothLeScannerCompat.java +++ b/scanner/src/main/java/no/nordicsemi/android/support/v18/scanner/BluetoothLeScannerCompat.java @@ -89,6 +89,12 @@ public abstract class BluetoothLeScannerCompat { private static BluetoothLeScannerCompat instance; + private static int versionSdkInt; + + public static void setScannerApi(int versionSdkInt) { + BluetoothLeScannerCompat.versionSdkInt = versionSdkInt; + } + /** * Returns the scanner compat object * @return scanner implementation @@ -97,11 +103,11 @@ public abstract class BluetoothLeScannerCompat { public synchronized static BluetoothLeScannerCompat getScanner() { if (instance != null) return instance; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) + if (versionSdkInt >= Build.VERSION_CODES.O) return instance = new BluetoothLeScannerImplOreo(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) + if (versionSdkInt >= Build.VERSION_CODES.M) return instance = new BluetoothLeScannerImplMarshmallow(); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) + if (versionSdkInt >= Build.VERSION_CODES.LOLLIPOP) return instance = new BluetoothLeScannerImplLollipop(); return instance = new BluetoothLeScannerImplJB(); } From 2ce683851cc3facdeec42671f8dc0bb882910888 Mon Sep 17 00:00:00 2001 From: Paul Peavyhouse Date: Mon, 11 Mar 2019 16:08:21 -0700 Subject: [PATCH 2/3] Oops; missed an important line :) --- .../android/support/v18/scanner/BluetoothLeScannerCompat.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scanner/src/main/java/no/nordicsemi/android/support/v18/scanner/BluetoothLeScannerCompat.java b/scanner/src/main/java/no/nordicsemi/android/support/v18/scanner/BluetoothLeScannerCompat.java index ec89228..ad5ede5 100644 --- a/scanner/src/main/java/no/nordicsemi/android/support/v18/scanner/BluetoothLeScannerCompat.java +++ b/scanner/src/main/java/no/nordicsemi/android/support/v18/scanner/BluetoothLeScannerCompat.java @@ -26,6 +26,7 @@ import android.app.PendingIntent; import android.content.Context; import android.os.Build; +import android.os.Build.VERSION; import android.os.Handler; import android.os.Looper; import android.os.SystemClock; @@ -89,7 +90,7 @@ public abstract class BluetoothLeScannerCompat { private static BluetoothLeScannerCompat instance; - private static int versionSdkInt; + private static int versionSdkInt = VERSION.SDK_INT; public static void setScannerApi(int versionSdkInt) { BluetoothLeScannerCompat.versionSdkInt = versionSdkInt; From a819f76609f8b0e1244bce1ff4e0a0cd786e8d64 Mon Sep 17 00:00:00 2001 From: Paul Peavyhouse Date: Mon, 11 Mar 2019 16:09:32 -0700 Subject: [PATCH 3/3] Tiny cleanup --- .../android/support/v18/scanner/BluetoothLeScannerCompat.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scanner/src/main/java/no/nordicsemi/android/support/v18/scanner/BluetoothLeScannerCompat.java b/scanner/src/main/java/no/nordicsemi/android/support/v18/scanner/BluetoothLeScannerCompat.java index ad5ede5..018a17c 100644 --- a/scanner/src/main/java/no/nordicsemi/android/support/v18/scanner/BluetoothLeScannerCompat.java +++ b/scanner/src/main/java/no/nordicsemi/android/support/v18/scanner/BluetoothLeScannerCompat.java @@ -26,7 +26,6 @@ import android.app.PendingIntent; import android.content.Context; import android.os.Build; -import android.os.Build.VERSION; import android.os.Handler; import android.os.Looper; import android.os.SystemClock; @@ -90,7 +89,7 @@ public abstract class BluetoothLeScannerCompat { private static BluetoothLeScannerCompat instance; - private static int versionSdkInt = VERSION.SDK_INT; + private static int versionSdkInt = Build.VERSION.SDK_INT; public static void setScannerApi(int versionSdkInt) { BluetoothLeScannerCompat.versionSdkInt = versionSdkInt;