[Architecture] ViewModel for MainActivity

AUTHORS

@@ -0,0 +1,4 @@
+Florent Revest [email protected]
+Doug Koellmer [email protected]
+Justus Tartz [email protected]
+Doomsdayrs [email protected]

app/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     id("com.android.application")
+    kotlin("android")
 }
 
 android {
@@ -35,8 +36,8 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
     lint {
         checkReleaseBuilds = true
@@ -53,11 +54,14 @@ repositories {
 
 dependencies {
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
+    implementation("androidx.core:core-ktx:1.9.0")
+    implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
+    implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1")
     testImplementation("junit:junit:4.13.2")
-    implementation("androidx.appcompat:appcompat:1.5.1")
+    implementation("androidx.appcompat:appcompat:1.6.0")
     implementation("androidx.legacy:legacy-support-v4:1.0.0")
     implementation("androidx.cardview:cardview:1.0.0")
-    implementation("com.google.android.material:material:1.6.1")
+    implementation("com.google.android.material:material:1.8.0")
     implementation("com.github.MagneFire:EasyWeather:1.3")
     implementation("com.google.code.gson:gson:2.9.1")
     implementation("org.osmdroid:osmdroid-android:6.1.14")

app/src/main/AndroidManifest.xml

@@ -14,6 +14,8 @@
     <uses-permission android:name="android.permission.ACCESS_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.NEARBY_WIFI_DEVICES" android:usesPermissionFlags="neverForLocation"/>
+
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

app/src/main/java/org/asteroidos/sync/MainActivity.java

@@ -1,5 +1,25 @@
+/*
+ * AsteroidOSSync
+ * Copyright (c) 2023 AsteroidOS
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package org.asteroidos.sync;
 
+import static android.os.ParcelUuid.fromString;
+
 import android.Manifest;
 import android.app.AlertDialog;
 import android.bluetooth.BluetoothAdapter;
@@ -17,10 +37,7 @@
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Looper;
-import android.os.Message;
-import android.os.Messenger;
 import android.os.ParcelUuid;
-import android.os.RemoteException;
 import android.provider.Settings;
 import android.util.Log;
 import android.view.MenuItem;
@@ -35,6 +52,7 @@
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 import androidx.fragment.app.FragmentTransaction;
+import androidx.lifecycle.ViewModelProvider;
 
 import org.asteroidos.sync.asteroid.IAsteroidDevice;
 import org.asteroidos.sync.fragments.AppListFragment;
@@ -45,6 +63,8 @@
 import org.asteroidos.sync.utils.AppInfo;
 import org.asteroidos.sync.utils.AppInfoHelper;
 import org.asteroidos.sync.utils.AsteroidUUIDS;
+import org.asteroidos.sync.viewmodel.base.MainActivityViewModel;
+import org.asteroidos.sync.viewmodel.impl.MainActivityViewModelImpl;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -55,8 +75,6 @@
 import no.nordicsemi.android.support.v18.scanner.ScanResult;
 import no.nordicsemi.android.support.v18.scanner.ScanSettings;
 
-import static android.os.ParcelUuid.fromString;
-
 public class MainActivity extends AppCompatActivity implements DeviceListFragment.OnDefaultDeviceSelectedListener,
         DeviceListFragment.OnScanRequestedListener, DeviceDetailFragment.OnDefaultDeviceUnselectedListener,
         DeviceDetailFragment.OnConnectRequestedListener, DeviceDetailFragment.OnAppSettingsClickedListener,
@@ -67,29 +85,25 @@ public class MainActivity extends AppCompatActivity implements DeviceListFragmen
     public static final String PREFS_DEFAULT_LOC_NAME = "defaultLocalName";
     private static final String TAG = "MainActivity";
     public static ArrayList<AppInfo> appInfoList;
-    final Messenger mDeviceDetailMessenger = new Messenger(new MainActivity.SynchronizationHandler(this));
-    public ParcelUuid asteroidUUID = fromString(AsteroidUUIDS.SERVICE_UUID.toString());
-    Messenger mSyncServiceMessenger;
+    public final ParcelUuid asteroidUUID = fromString(AsteroidUUIDS.SERVICE_UUID.toString());
     ActivityResultLauncher<Intent> mLocationEnableActivityLauncher;
     LocationManager mLocationManager;
     /* Synchronization service events handling */
     private final ServiceConnection mConnection = new ServiceConnection() {
         public void onServiceConnected(ComponentName className,
                                        IBinder service) {
-            mSyncServiceMessenger = new Messenger(service);
             onUpdateRequested();
         }
 
         public void onServiceDisconnected(ComponentName className) {
-            mSyncServiceMessenger = null;
         }
     };
     Intent mSyncServiceIntent;
     IAsteroidDevice.ConnectionState mStatus = IAsteroidDevice.ConnectionState.STATUS_DISCONNECTED;
     ScanSettings mSettings;
     List<ScanFilter> mFilters;
     private DeviceListFragment mListFragment;
-    public ScanCallback scanCallback = new ScanCallback() {
+    public final ScanCallback scanCallback = new ScanCallback() {
         @Override
         public void onScanResult(int callbackType, @NonNull ScanResult result) {
             super.onScanResult(callbackType, result);
@@ -102,30 +116,31 @@ public void onScanResult(int callbackType, @NonNull ScanResult result) {
                 }
                 return;
             }
-            Log.d(TAG, "SCAN RESULT:" + result.getDevice().toString() + " Name:" + result.getDevice().getName());
+            Log.d(TAG, "SCAN RESULT:" + result.getDevice() + " Name:" + result.getDevice().getName());
             ParcelUuid[] arr = result.getDevice().getUuids();
         }
     };
     private DeviceDetailFragment mDetailFragment;
     private Fragment mPreviousFragment;
     private BluetoothLeScannerCompat mScanner;
     private SharedPreferences mPrefs;
+    MainActivityViewModel viewModel;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+        viewModel = new ViewModelProvider(this).get(MainActivityViewModelImpl.class);
+        viewModel.onWatchLocalNameChanged(this::handleSetLocalName);
+        viewModel.onWatchConnectionStateChanged(this::handleSetStatus);
+        viewModel.onWatchBatteryPercentageChanged(this::handleSetBatteryPercentage);
 
         mScanner = BluetoothLeScannerCompat.getScanner();
 
         mPrefs = getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE);
         String defaultDevMacAddr = mPrefs.getString(PREFS_DEFAULT_MAC_ADDR, "");
 
-        Thread appInfoRetrieval = new Thread(new Runnable() {
-            public void run() {
-                appInfoList = AppInfoHelper.getPackageInfo(MainActivity.this);
-            }
-        });
+        Thread appInfoRetrieval = new Thread(() -> appInfoList = AppInfoHelper.getPackageInfo(MainActivity.this));
         appInfoRetrieval.start();
 
         mSettings = new ScanSettings.Builder()
@@ -179,20 +194,14 @@ public void onDefaultDeviceSelected(BluetoothDevice mDevice) {
         mDetailFragment = new DeviceDetailFragment();
 
         if (mListFragment != null) mListFragment.scanningStopped();
-        else if (mDetailFragment != null) mDetailFragment.scanningStopped();
+        else mDetailFragment.scanningStopped();
 
         getSupportFragmentManager()
                 .beginTransaction()
                 .replace(R.id.flContainer, mDetailFragment)
                 .commit();
 
-        try {
-            Message msg = Message.obtain(null, SynchronizationService.MSG_SET_DEVICE);
-            msg.obj = mDevice;
-            msg.replyTo = mDeviceDetailMessenger;
-            mSyncServiceMessenger.send(msg);
-        } catch (RemoteException ignored) {
-        }
+        viewModel.onDefaultDeviceSelected(mDevice);
 
         onConnectRequested();
 
@@ -209,49 +218,27 @@ public void onDefaultDeviceUnselected() {
                 .replace(R.id.flContainer, mListFragment)
                 .commit();
 
-        try {
-            Message msg = Message.obtain(null, SynchronizationService.MSG_UNSET_DEVICE);
-            msg.obj = "";
-            msg.replyTo = mDeviceDetailMessenger;
-            mSyncServiceMessenger.send(msg);
-        } catch (RemoteException ignored) {
-        }
+        viewModel.requestUnsetDevice();
 
         mDetailFragment = null;
         setTitle(R.string.app_name);
     }
 
     @Override
     public void onUpdateRequested() {
-        try {
-            Message msg = Message.obtain(null, SynchronizationService.MSG_UPDATE);
-            msg.replyTo = mDeviceDetailMessenger;
-            if (mSyncServiceMessenger != null)
-                mSyncServiceMessenger.send(msg);
-        } catch (RemoteException ignored) {
-        }
+        viewModel.requestUpdate();
     }
 
     @Override
     public void onConnectRequested() {
         if (mScanner != null)
             mScanner.stopScan(scanCallback);
-        try {
-            Message msg = Message.obtain(null, SynchronizationService.MSG_CONNECT);
-            msg.replyTo = mDeviceDetailMessenger;
-            mSyncServiceMessenger.send(msg);
-        } catch (RemoteException ignored) {
-        }
+        viewModel.requestConnect();
     }
 
     @Override
     public void onDisconnectRequested() {
-        try {
-            Message msg = Message.obtain(null, SynchronizationService.MSG_DISCONNECT);
-            msg.replyTo = mDeviceDetailMessenger;
-            mSyncServiceMessenger.send(msg);
-        } catch (RemoteException ignored) {
-        }
+        viewModel.requestDisconnect();
     }
 
     @Override
@@ -342,12 +329,7 @@ private void handleSetStatus(IAsteroidDevice.ConnectionState status) {
             mStatus = status;
         }
         if (status == IAsteroidDevice.ConnectionState.STATUS_CONNECTED) {
-            try {
-                Message msg = Message.obtain(null, SynchronizationService.MSG_REQUEST_BATTERY_LIFE);
-                msg.replyTo = mDeviceDetailMessenger;
-                mSyncServiceMessenger.send(msg);
-            } catch (RemoteException ignored) {
-            }
+            viewModel.requestBatteryLevel();
         }
     }
 
@@ -418,7 +400,7 @@ protected void onPause() {
     }
 
     @Override
-    public void onConfigurationChanged(Configuration newConfig) {
+    public void onConfigurationChanged(@NonNull Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
         getDelegate().onConfigurationChanged(newConfig);
         int currentNightMode = newConfig.uiMode & Configuration.UI_MODE_NIGHT_MASK;
@@ -435,29 +417,4 @@ public void onConfigurationChanged(Configuration newConfig) {
         overridePendingTransition(0, 0);
         startActivity(getIntent());
     }
-
-    static private class SynchronizationHandler extends Handler {
-        private final MainActivity mActivity;
-
-        SynchronizationHandler(MainActivity activity) {
-            mActivity = activity;
-        }
-
-        @Override
-        public void handleMessage(Message msg) {
-            switch (msg.what) {
-                case SynchronizationService.MSG_SET_LOCAL_NAME:
-                    mActivity.handleSetLocalName((String) msg.obj);
-                    break;
-                case SynchronizationService.MSG_SET_STATUS:
-                    mActivity.handleSetStatus((IAsteroidDevice.ConnectionState) msg.obj);
-                    break;
-                case SynchronizationService.MSG_SET_BATTERY_PERCENTAGE:
-                    mActivity.handleSetBatteryPercentage(msg.arg1);
-                    break;
-                default:
-                    super.handleMessage(msg);
-            }
-        }
-    }
 }

app/src/main/java/org/asteroidos/sync/NotificationPreferences.java

@@ -1,3 +1,21 @@
+/*
+ * AsteroidOSSync
+ * Copyright (c) 2023 AsteroidOS
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
 package org.asteroidos.sync;
 
 import android.content.Context;
@@ -21,7 +39,7 @@ public enum NotificationOption {
         STRONG_VIBRATION(4),
         RINGTONE_VIBRATION(5);
 
-        private int value;
+        private final int value;
         NotificationOption(int value) {
             this.value = value;
         }