From aee5b03a293c6e54829dc592ca934072a28d798c Mon Sep 17 00:00:00 2001
From: Electric1447 <itai.levin4@gmail.com>
Date: Mon, 19 Jul 2021 00:56:49 +0300
Subject: [PATCH] Android 12 support

---
 OpenPods/app/build.gradle                            |  4 ++--
 OpenPods/app/src/main/AndroidManifest.xml            |  3 +++
 .../main/java/com/dosse/airpods/IntroActivity.java   | 12 +++++++-----
 .../main/java/com/dosse/airpods/PermissionUtils.java |  6 ++++++
 OpenPods/build.gradle                                |  2 +-
 OpenPods/gradle/wrapper/gradle-wrapper.properties    |  4 ++--
 6 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/OpenPods/app/build.gradle b/OpenPods/app/build.gradle
index 8eb1b69..339142e 100644
--- a/OpenPods/app/build.gradle
+++ b/OpenPods/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     buildToolsVersion '30.0.3'
 
     defaultConfig {
         applicationId "com.dosse.airpods"
         minSdkVersion 23
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 17
         versionName '1.6'
 
diff --git a/OpenPods/app/src/main/AndroidManifest.xml b/OpenPods/app/src/main/AndroidManifest.xml
index 3e85cdf..faa46b7 100644
--- a/OpenPods/app/src/main/AndroidManifest.xml
+++ b/OpenPods/app/src/main/AndroidManifest.xml
@@ -6,6 +6,8 @@
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
     <uses-permission android:name="android.permission.REQUEST_IGNORE_BATTERY_OPTIMIZATIONS" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
@@ -24,6 +26,7 @@
 
         <activity
             android:name=".MainActivity"
+            android:exported="true"
             android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/OpenPods/app/src/main/java/com/dosse/airpods/IntroActivity.java b/OpenPods/app/src/main/java/com/dosse/airpods/IntroActivity.java
index 04a10d2..0e361ca 100644
--- a/OpenPods/app/src/main/java/com/dosse/airpods/IntroActivity.java
+++ b/OpenPods/app/src/main/java/com/dosse/airpods/IntroActivity.java
@@ -58,20 +58,22 @@ public class IntroActivity extends AppCompatActivity {
     }
 
     private int getPermissionState () {
-        if (!PermissionUtils.getBatteryOptimizationsPermission(this))
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) if (!PermissionUtils.getBluetoothPermissions(this))
             return 1;
-        else if (!PermissionUtils.getFineLocationPermission(this))
+        if (!PermissionUtils.getBatteryOptimizationsPermission(this))
             return 2;
-        else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) if (!PermissionUtils.getBackgroundLocationPermission(this))
+        if (!PermissionUtils.getFineLocationPermission(this))
             return 3;
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) if (!PermissionUtils.getBackgroundLocationPermission(this))
+            return 4;
 
         return 0;
     }
 
     @SuppressLint("BatteryLife")
     private void initScreen () {
-        int step = getPermissionState();
-        int numOfSteps = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) ? 3 : 2;
+        int step = getPermissionState() - ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) ? 0 : 1);
+        int numOfSteps = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) ? ((Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) ? 4 : 3) : 2;
 
         switch (step) {
             case 1:
diff --git a/OpenPods/app/src/main/java/com/dosse/airpods/PermissionUtils.java b/OpenPods/app/src/main/java/com/dosse/airpods/PermissionUtils.java
index a5e2002..0550e64 100644
--- a/OpenPods/app/src/main/java/com/dosse/airpods/PermissionUtils.java
+++ b/OpenPods/app/src/main/java/com/dosse/airpods/PermissionUtils.java
@@ -21,6 +21,12 @@ public class PermissionUtils {
         }
     }
 
+    @RequiresApi(api = Build.VERSION_CODES.S)
+    public static boolean getBluetoothPermissions (Context context) {
+        return ContextCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_SCAN) == PackageManager.PERMISSION_GRANTED
+                && ContextCompat.checkSelfPermission(context, Manifest.permission.BLUETOOTH_CONNECT) == PackageManager.PERMISSION_GRANTED;
+    }
+
     public static boolean getFineLocationPermission (Context context) {
         return ContextCompat.checkSelfPermission(context, Manifest.permission.ACCESS_FINE_LOCATION) == PackageManager.PERMISSION_GRANTED;
     }
diff --git a/OpenPods/build.gradle b/OpenPods/build.gradle
index 9513f7f..f7d726a 100644
--- a/OpenPods/build.gradle
+++ b/OpenPods/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.android.tools.build:gradle:4.2.2'
         
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/OpenPods/gradle/wrapper/gradle-wrapper.properties b/OpenPods/gradle/wrapper/gradle-wrapper.properties
index 01b9392..b81219d 100644
--- a/OpenPods/gradle/wrapper/gradle-wrapper.properties
+++ b/OpenPods/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Jun 07 14:29:04 IDT 2021
+#Mon Jul 19 00:51:02 IDT 2021
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME