More robust FlySight2 detection

Author: platypii

app/build.gradle

@@ -7,9 +7,9 @@ android {
 
     defaultConfig {
         applicationId "com.platypii.baseline"
-        compileSdk 34
+        compileSdk 35
         minSdkVersion 21
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 151
         versionName "5.15-beta"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -39,14 +39,14 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     annotationProcessor 'androidx.annotation:annotation:1.9.1'
-    implementation 'androidx.appcompat:appcompat:1.7.0'
-    implementation 'androidx.fragment:fragment:1.8.5'
+    implementation 'androidx.appcompat:appcompat:1.7.1'
+    implementation 'androidx.fragment:fragment:1.8.8'
     implementation 'com.github.weliem:blessed-android:2.5.0'
-    implementation 'com.google.android.gms:play-services-auth:21.2.0'
-    implementation 'com.google.android.gms:play-services-maps:19.0.0'
+    implementation 'com.google.android.gms:play-services-auth:21.3.0'
+    implementation 'com.google.android.gms:play-services-maps:19.2.0'
     implementation 'com.google.code.gson:gson:2.11.0'
-    implementation 'com.google.firebase:firebase-analytics:22.1.2'
-    implementation 'com.google.firebase:firebase-crashlytics:19.2.1'
+    implementation 'com.google.firebase:firebase-analytics:22.5.0'
+    implementation 'com.google.firebase:firebase-crashlytics:19.4.4'
     implementation 'com.squareup.okhttp3:okhttp:4.9.1'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.7.3'
+        classpath 'com.android.tools.build:gradle:8.10.1'
         classpath 'com.google.firebase:firebase-crashlytics-gradle:3.0.2'
         classpath 'com.google.gms:google-services:4.4.2'
 

common/build.gradle

@@ -29,9 +29,9 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     annotationProcessor 'androidx.annotation:annotation:1.9.1'
     implementation 'com.github.weliem:blessed-android:2.5.0'
-    implementation 'com.google.android.gms:play-services-auth:21.2.0'
-    implementation 'com.google.android.gms:play-services-maps:19.0.0'
-    implementation 'com.google.firebase:firebase-crashlytics:19.2.1'
+    implementation 'com.google.android.gms:play-services-auth:21.3.0'
+    implementation 'com.google.android.gms:play-services-maps:19.2.0'
+    implementation 'com.google.firebase:firebase-crashlytics:19.4.4'
     implementation 'org.greenrobot:eventbus:3.3.1'
     testImplementation 'junit:junit:4.13.2'
 }

common/src/main/java/com/platypii/baseline/bluetooth/Flysight2Protocol.java

@@ -7,6 +7,7 @@
 import com.platypii.baseline.util.PubSub;
 
 import android.bluetooth.le.ScanRecord;
+import android.os.ParcelUuid;
 import android.util.Log;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -16,6 +17,7 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.Arrays;
+import java.util.List;
 import java.util.UUID;
 
 public class Flysight2Protocol extends BleProtocol {
@@ -44,8 +46,25 @@ public Flysight2Protocol(@NonNull PubSub<MLocation> locationUpdates) {
 
     @Override
     public boolean canParse(@NonNull BluetoothPeripheral peripheral, @Nullable ScanRecord record) {
-        // TODO: Check address
-        return peripheral.getName().equals("FlySight");
+        if (record != null) {
+            // Check services
+            final List<ParcelUuid> services = record.getServiceUuids();
+            if (services != null) {
+                for (ParcelUuid parcelUuid : services) {
+                    if (parcelUuid.getUuid().equals(flysightService1)) {
+                        return true;
+                    }
+                }
+            }
+            // Check manufacturer
+//            final byte[] mfg = record.getManufacturerSpecificData(2523);
+//            if (mfg != null && mfg.length == 1 && mfg[0] == 0) {
+//                return true;
+//            }
+        }
+        if (peripheral.getName().startsWith("KFS")) return true;
+        if (peripheral.getName().startsWith("FlySight")) return true;
+        return false;
     }
 
     @Override

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME