2nd gen Airpods support, bumped version to Alpha 8

2nd gen Airpods support, bumped version to Alpha 8

OpenPods/.idea/codeStyles/Project.xml

@@ -1,29 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
-  </code_scheme>
-</component>

OpenPods/.idea/encodings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with NO BOM" />
+</project>

OpenPods/app/build.gradle

@@ -6,8 +6,8 @@ android {
         applicationId "com.dosse.airpods"
         minSdkVersion 23
         targetSdkVersion 28
-        versionCode 6
+        versionCode 8
-        versionName '0.6'
+        versionName '0.8'
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

OpenPods/app/src/main/java/com/dosse/airpods/PodsService.java

@@ -11,7 +11,10 @@ import android.bluetooth.BluetoothManager;
 import android.bluetooth.BluetoothProfile;
 import android.bluetooth.le.BluetoothLeScanner;
 import android.bluetooth.le.ScanCallback;
+import android.bluetooth.le.ScanFilter;
+import android.bluetooth.le.ScanFilter.Builder;
 import android.bluetooth.le.ScanResult;
+import android.bluetooth.le.ScanSettings;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
@@ -21,13 +24,13 @@ import android.os.Build;
 import android.os.IBinder;
 import android.os.ParcelUuid;
 import android.os.SystemClock;
-import android.provider.Settings;
 import android.support.v4.app.NotificationCompat;
 import android.util.Log;
 import android.view.View;
 import android.widget.RemoteViews;
-
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 
 /**
  * This is the class that does most of the work. It has 3 functions:
@@ -78,7 +81,20 @@ public class PodsService extends Service {
             btScanner = btAdapter.getBluetoothLeScanner();
             if (btAdapter == null) throw new Exception("No BT");
             if (!btAdapter.isEnabled()) throw new Exception("BT Off");
-            btScanner.startScan(new ScanCallback() {
+
+            List<ScanFilter> filters = getScanFilters();
+            ScanSettings settings = new ScanSettings.Builder().setScanMode(2).setReportDelay(2).build();
+
+            btScanner.startScan(
+                    filters,
+                    settings,
+                    new ScanCallback() {
+                @Override
+                public void onBatchScanResults(List<ScanResult> scanResults) {
+                    for (ScanResult result : scanResults) onScanResult(-1, result);
+                    super.onBatchScanResults(scanResults);
+                }
+
                 @Override
                 public void onScanResult(int callbackType, ScanResult result) {
                     try {
@@ -128,6 +144,21 @@ public class PodsService extends Service {
         }
     }
 
+    private List<ScanFilter> getScanFilters() {
+        byte[] manufacturerData = new byte[27];
+        byte[] manufacturerDataMask = new byte[27];
+
+        manufacturerData[0] = 7;
+        manufacturerData[1] = 25;
+
+        manufacturerDataMask[0] = -1;
+        manufacturerDataMask[1] = -1;
+
+        Builder builder = new Builder();
+        builder.setManufacturerData(76, manufacturerData, manufacturerDataMask);
+        return Collections.singletonList(builder.build());
+    }
+
     private void stopAirPodsScanner(){
         try{
             if(btScanner!=null){

OpenPods/app/src/main/res/layout/status_big.xml

@@ -4,6 +4,7 @@
     android:layout_height="wrap_content"
     android:padding="12dp"
     android:gravity="center"
+    android:background="@color/white"
     >
 
 
@@ -30,6 +31,7 @@
             android:gravity="center"
             android:text="100%+"
             android:id="@+id/leftPodText"
+            android:textColor="@color/black"
             />
 
         <ProgressBar
@@ -65,6 +67,7 @@
             android:gravity="center"
             android:text="100%+"
             android:id="@+id/rightPodText"
+            android:textColor="@color/black"
             />
 
         <ProgressBar
@@ -100,6 +103,7 @@
             android:gravity="center"
             android:text="100%+"
             android:id="@+id/podCaseText"
+            android:textColor="@color/black"
             />
 
         <ProgressBar

OpenPods/app/src/main/res/layout/status_small.xml

@@ -4,6 +4,7 @@
     android:layout_height="wrap_content"
     android:padding="12dp"
     android:gravity="center"
+    android:background="@color/white"
     >
 
     <RelativeLayout
@@ -29,6 +30,7 @@
             android:gravity="center_vertical"
             android:text="100%+"
             android:id="@+id/leftPodText"
+            android:textColor="@color/black"
             />
 
         <ProgressBar
@@ -65,6 +67,7 @@
             android:gravity="center_vertical"
             android:text="100%+"
             android:id="@+id/rightPodText"
+            android:textColor="@color/black"
             />
 
         <ProgressBar
@@ -101,6 +104,7 @@
             android:gravity="center_vertical"
             android:text="100%+"
             android:id="@+id/podCaseText"
+            android:textColor="@color/black"
             />
 
         <ProgressBar

OpenPods/app/src/main/res/values-de/strings.xml

@@ -9,5 +9,5 @@
     <string name="hideClicked">Das Icon wird bald verschwinden</string>
     <string name="noBtText">Es sieht so aus als hätte dieses Gerät kein Bluetooth LE</string>
     <string name="locationDisabledText">Du musst Standortinformationen aktivieren, damit OpenPods den Status deiner AirPods auslesen kann</string>
-    <string name="supportedDevices">Unterstützte Geräte:\n&#8226; Apple AirPods 1st gen</string>
+    <string name="supportedDevices">Unterstützte Geräte:\n&#8226; Apple AirPods 1st gen\n&#8226; Apple AirPods 2nd gen</string>
 </resources>

OpenPods/app/src/main/res/values-es/strings.xml

@@ -8,6 +8,5 @@
     <string name="hideClicked">El ícono desaparecerá pronto</string>
     <string name="noBtText">Parece que este dispositivo no tiene Bluetooth LE</string>
     <string name="locationDisabledText">Necesitas encender Localización para permitir que OpenPods lea el estado</string>
-    <string name="supportedDevices">Dispositivos compatibles:\n
+    <string name="supportedDevices">Dispositivos compatibles:\n&#8226; Apple AirPods 1st gen\n&#8226; Apple AirPods 2nd gen</string>
-  &#8226; Apple AirPods 1st gen</string>
 </resources>

OpenPods/app/src/main/res/values-it/strings.xml

@@ -9,5 +9,5 @@
     <string name="hideClicked">L\'icona sarà rimossa presto</string>
     <string name="noBtText">Questo dispositivo non supporta Bluetooth LE</string>
     <string name="locationDisabledText">Attiva la posizione per permttere a OpenPods di leggere lo stato</string>
-    <string name="supportedDevices">Dispositivi supportati:\n&#8226; Apple AirPods 1st gen</string>
+    <string name="supportedDevices">Dispositivi supportati:\n&#8226; Apple AirPods 1st gen\n&#8226; Apple AirPods 2nd gen</string>
 </resources>

OpenPods/app/src/main/res/values-zh-rCN/strings.xml

@@ -9,5 +9,5 @@
     <string name="hideClicked">桌面图标很快就会隐藏掉</string>
     <string name="noBtText">看起来您的设备并不支持蓝牙</string>
     <string name="locationDisabledText">您需要开启定位来让 OpenPods 读取状态</string>
-    <string name="supportedDevices">支持的设备:\n&#8226; Apple AirPods 一代</string>
+    <string name="supportedDevices">支持的设备:\n&#8226; Apple AirPods 1st gen\n&#8226; Apple AirPods 2nd gen</string>
 </resources>

OpenPods/app/src/main/res/values/colors.xml

@@ -3,5 +3,6 @@
     <color name="colorPrimary">#448aff</color>
     <color name="colorPrimaryDark">#0d47a1</color>
     <color name="colorAccent">#448aff</color>
-
+    <color name="white">#ffffff</color>
+    <color name="black">#000000</color>
 </resources>

OpenPods/app/src/main/res/values/strings.xml

@@ -9,5 +9,5 @@
     <string name="hideClicked">The icon will disappear soon</string>
     <string name="noBtText">It looks like this device doesn\'t have Bluetooth LE</string>
     <string name="locationDisabledText">You need to turn on Location to allow OpenPods to read the status</string>
-    <string name="supportedDevices">Supported devices:\n&#8226; Apple AirPods 1st gen</string>
+    <string name="supportedDevices">Supported devices:\n&#8226; Apple AirPods 1st gen\n&#8226; Apple AirPods 2nd gen</string>
 </resources>

OpenPods/build.gradle

@@ -7,7 +7,7 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.2'
+        classpath 'com.android.tools.build:gradle:3.4.0'
         
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

OpenPods/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Mar 12 08:48:48 CET 2019
+#Tue May 14 16:46:59 CEST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip

README.md

@@ -16,6 +16,7 @@ The project is currently in Alpha.
 
 ## Supported devices
 * Apple AirPods 1st gen
+* Apple AirPods 2nd gen
 
 ## Project status
 Right now, this project should be considered in alpha state. It was not extensively tested, it may not be stable or work at all on your device.