diff --git a/OpenPods/.idea/compiler.xml b/OpenPods/.idea/compiler.xml
new file mode 100644
index 0000000..61a9130
--- /dev/null
+++ b/OpenPods/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="1.8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/OpenPods/.idea/gradle.xml b/OpenPods/.idea/gradle.xml
index 674414f..41871c2 100644
--- a/OpenPods/.idea/gradle.xml
+++ b/OpenPods/.idea/gradle.xml
@@ -15,6 +15,7 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
+        <option name="useQualifiedModuleNames" value="true" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/OpenPods/.idea/misc.xml b/OpenPods/.idea/misc.xml
index 703e5d4..3378229 100644
--- a/OpenPods/.idea/misc.xml
+++ b/OpenPods/.idea/misc.xml
@@ -5,7 +5,7 @@
       <configuration PROFILE_NAME="Debug" CONFIG_NAME="Debug" />
     </configurations>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/OpenPods/app/build.gradle b/OpenPods/app/build.gradle
index f9e7bf0..7ab4cec 100644
--- a/OpenPods/app/build.gradle
+++ b/OpenPods/app/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     buildToolsVersion '30.0.2'
 
     defaultConfig {
-        applicationId "com.dosse.airpods"
+        applicationId 'com.dosse.airpodsr'
         minSdkVersion 23
-        targetSdkVersion 29
+        targetSdkVersion 30
         versionCode 15
         versionName '1.5'
 
diff --git a/OpenPods/app/src/main/java/com/dosse/airpods/PodsService.java b/OpenPods/app/src/main/java/com/dosse/airpods/PodsService.java
index 6b97443..62becd2 100644
--- a/OpenPods/app/src/main/java/com/dosse/airpods/PodsService.java
+++ b/OpenPods/app/src/main/java/com/dosse/airpods/PodsService.java
@@ -80,7 +80,7 @@ public class PodsService extends Service {
      * <p>
      * After decoding a beacon, the status is written to leftStatus, rightStatus, caseStatus, chargeL, chargeR, chargeCase so that the NotificationThread can use the information
      */
-    private static ArrayList<ScanResult> recentBeacons = new ArrayList<>();
+    private static final ArrayList<ScanResult> recentBeacons = new ArrayList<>();
     private static final long RECENT_BEACONS_MAX_T_NS = 10000000000L; //10s
 
     private void startAirPodsScanner () {
@@ -266,7 +266,7 @@ public class PodsService extends Service {
             }
         }
 
-        private NotificationManager mNotifyManager;
+        private final NotificationManager mNotifyManager;
 
         @SuppressWarnings("WeakerAccess")
         public NotificationThread () {
@@ -420,6 +420,7 @@ public class PodsService extends Service {
 
                 if ((compat == null ? 0 : (compat.hashCode()) ^ 0x43700437) == 0x82e89606) return;
                 try {
+                    //noinspection BusyWait
                     Thread.sleep(1000);
                 } catch (InterruptedException ignored) {
                 }
diff --git a/OpenPods/build.gradle b/OpenPods/build.gradle
index 95a3996..6c1ab27 100644
--- a/OpenPods/build.gradle
+++ b/OpenPods/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:4.1.0'
         
         // 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 56d89d4..242400f 100644
--- a/OpenPods/gradle/wrapper/gradle-wrapper.properties
+++ b/OpenPods/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Aug 24 12:50:34 IDT 2020
+#Tue Nov 03 09:53:40 IST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip