Fix small bug on Android app

drip-android-observer-master/Android/app/build.gradle

@@ -66,7 +66,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'org.bouncycastle:bcprov-jdk15to18:1.69'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.4'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
 }

drip-android-observer-master/Android/app/src/main/java/org/dripdronescanner/android/app/DebugActivity.java

@@ -7,7 +7,6 @@
 package org.dripdronescanner.android.app;
 
 import android.Manifest;
-import android.annotation.TargetApi;
 import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
 import android.content.Intent;
@@ -37,6 +36,7 @@ import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.lifecycle.Observer;
+import androidx.lifecycle.ViewModelProvider;
 import androidx.lifecycle.ViewModelProviders;
 
 import com.google.android.gms.location.LocationCallback;
@@ -67,7 +67,6 @@ public class DebugActivity extends AppCompatActivity {
     WiFiNaNScanner wiFiNaNScanner;
     WiFiBeaconScanner wiFiBeaconScanner;
     boolean wifiOn = false;
-    boolean bluetoothOn = false;
 
     private AircraftViewModel mModel;
     OpenDroneIdDataManager dataManager;
@@ -145,33 +144,32 @@ public class DebugActivity extends AppCompatActivity {
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.clear:
-                dataManager.getAircraft().clear();
-                mModel.setAllAircraft(dataManager.getAircraft());
-                LogWriter.bumpSession();
-                return true;
-            case R.id.menu_log:
-                boolean enabled = !getLogEnabled();
-                setLogEnabled(enabled);
-                mMenuLogItem.setChecked(enabled);
-                if (enabled) {
-                    createNewLogfile();
-                    wiFiNaNScanner.setLogger(logger);
-                    wiFiBeaconScanner.setLogger(logger);
-                } else {
-                    logger.close();
-                    btScanner.setLogger(null);
-                    wiFiNaNScanner.setLogger(null);
-                    wiFiBeaconScanner.setLogger(null);
-                }
-                return true;
-            case R.id.log_location:
-                if (getLogEnabled())
-                    Toast.makeText(getBaseContext(), "Logging to " + loggerFile, Toast.LENGTH_LONG).show();
-                else
-                    Toast.makeText(getBaseContext(), "Logging not activated", Toast.LENGTH_LONG).show();
-                return true;
+        if (item.getItemId() == R.id.clear) {
+            dataManager.getAircraft().clear();
+            mModel.setAllAircraft(dataManager.getAircraft());
+            LogWriter.bumpSession();
+            return true;
+        } else if (item.getItemId() == R.id.menu_log) {
+            boolean enabled = !getLogEnabled();
+            setLogEnabled(enabled);
+            mMenuLogItem.setChecked(enabled);
+            if (enabled) {
+                createNewLogfile();
+                wiFiNaNScanner.setLogger(logger);
+                wiFiBeaconScanner.setLogger(logger);
+            } else {
+                logger.close();
+                btScanner.setLogger(null);
+                wiFiNaNScanner.setLogger(null);
+                wiFiBeaconScanner.setLogger(null);
+            }
+            return true;
+        } else if (item.getItemId() == R.id.log_location) {
+            if (getLogEnabled())
+                Toast.makeText(getBaseContext(), "Logging to " + loggerFile, Toast.LENGTH_LONG).show();
+            else
+                Toast.makeText(getBaseContext(), "Logging not activated", Toast.LENGTH_LONG).show();
+            return true;
         }
         return false;
     }
@@ -215,7 +213,7 @@ public class DebugActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.activity_debug);
-        mModel = ViewModelProviders.of(this).get(AircraftViewModel.class);
+        mModel = new ViewModelProvider(this).get(AircraftViewModel.class);
 
         // Ask for permissions for SDK >= 31
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {