Merge pull request #207 from NordicSemiconductor/bugfix/thread-closed

Bugfix: Fixed crash when MainActivity was destroyed when selecting a file
NordicSemiconductor · Nov 14, 2024 · de9f189 · de9f189
2 parents d09f3a7 + a71ee77
commit de9f189
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 45 deletions.
diff --git a/sample/src/main/java/io/runtime/mcumgr/sample/MainActivity.java b/sample/src/main/java/io/runtime/mcumgr/sample/MainActivity.java
@@ -30,7 +30,6 @@
 import androidx.core.view.WindowInsetsCompat;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentTransaction;
-import androidx.lifecycle.ViewModelProvider;
 
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 
@@ -39,6 +38,7 @@
 import dagger.android.AndroidInjector;
 import dagger.android.DispatchingAndroidInjector;
 import dagger.android.HasAndroidInjector;
+import io.runtime.mcumgr.McuMgrTransport;
 import io.runtime.mcumgr.sample.application.Dagger2Application;
 import io.runtime.mcumgr.sample.databinding.ActivityMainBinding;
 import io.runtime.mcumgr.sample.di.Injectable;
@@ -47,7 +47,6 @@
 import io.runtime.mcumgr.sample.fragment.ImageFragment;
 import io.runtime.mcumgr.sample.fragment.LogsStatsFragment;
 import io.runtime.mcumgr.sample.fragment.ShellFragment;
-import io.runtime.mcumgr.sample.viewmodel.MainViewModel;
 import io.runtime.mcumgr.sample.viewmodel.mcumgr.McuMgrViewModelFactory;
 
 @SuppressWarnings("ConstantConditions")
@@ -60,7 +59,7 @@ public class MainActivity extends AppCompatActivity
     @Inject
     McuMgrViewModelFactory viewModelFactory;
     @Inject
-    BluetoothDevice device;
+    McuMgrTransport mcuMgrTransport;
     @Inject
     @Nullable
     Uri logSessionUri;
@@ -115,9 +114,6 @@ protected void onCreate(@Nullable final Bundle savedInstanceState) {
         }
         final String deviceAddress = device.getAddress();
 
-        new ViewModelProvider(this, viewModelFactory)
-                .get(MainViewModel.class);
-
         // Configure the view.
         final Toolbar toolbar = binding.toolbar;
         setSupportActionBar(toolbar);
@@ -192,4 +188,13 @@ public boolean onOptionsItemSelected(final @NonNull MenuItem item) {
         }
         return super.onOptionsItemSelected(item);
     }
+
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+
+        if (isFinishing()) {
+            mcuMgrTransport.release();
+        }
+    }
 }
diff --git a/sample/src/main/java/io/runtime/mcumgr/sample/di/component/McuMgrViewModelSubComponent.java b/sample/src/main/java/io/runtime/mcumgr/sample/di/component/McuMgrViewModelSubComponent.java
@@ -8,9 +8,9 @@
 
 import dagger.Subcomponent;
 import io.runtime.mcumgr.sample.viewmodel.FileBrowserViewModel;
-import io.runtime.mcumgr.sample.viewmodel.MainViewModel;
 import io.runtime.mcumgr.sample.viewmodel.mcumgr.DeviceStatusViewModel;
 import io.runtime.mcumgr.sample.viewmodel.mcumgr.EchoViewModel;
+import io.runtime.mcumgr.sample.viewmodel.mcumgr.ExecViewModel;
 import io.runtime.mcumgr.sample.viewmodel.mcumgr.FilesDownloadViewModel;
 import io.runtime.mcumgr.sample.viewmodel.mcumgr.FilesUploadViewModel;
 import io.runtime.mcumgr.sample.viewmodel.mcumgr.ImageControlViewModel;
@@ -20,7 +20,6 @@
 import io.runtime.mcumgr.sample.viewmodel.mcumgr.McuMgrViewModel;
 import io.runtime.mcumgr.sample.viewmodel.mcumgr.McuMgrViewModelFactory;
 import io.runtime.mcumgr.sample.viewmodel.mcumgr.ResetViewModel;
-import io.runtime.mcumgr.sample.viewmodel.mcumgr.ExecViewModel;
 import io.runtime.mcumgr.sample.viewmodel.mcumgr.StatsViewModel;
 
 /**
@@ -35,8 +34,6 @@ interface Builder {
         McuMgrViewModelSubComponent build();
     }
 
-    MainViewModel mainViewModel();
-
     DeviceStatusViewModel deviceStatusViewModel();
     EchoViewModel echoViewModel();
     ResetViewModel resetViewModel();

diff --git a/sample/src/main/java/io/runtime/mcumgr/sample/viewmodel/MainViewModel.java b/sample/src/main/java/io/runtime/mcumgr/sample/viewmodel/MainViewModel.java
diff --git a/sample/src/main/java/io/runtime/mcumgr/sample/viewmodel/mcumgr/McuMgrViewModelFactory.java b/sample/src/main/java/io/runtime/mcumgr/sample/viewmodel/mcumgr/McuMgrViewModelFactory.java
@@ -6,18 +6,18 @@
 
 package io.runtime.mcumgr.sample.viewmodel.mcumgr;
 
+import androidx.annotation.NonNull;
+import androidx.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModelProvider;
+
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.Callable;
 
 import javax.inject.Inject;
 
-import androidx.annotation.NonNull;
-import androidx.lifecycle.ViewModel;
-import androidx.lifecycle.ViewModelProvider;
 import io.runtime.mcumgr.sample.di.component.McuMgrViewModelSubComponent;
 import io.runtime.mcumgr.sample.viewmodel.FileBrowserViewModel;
-import io.runtime.mcumgr.sample.viewmodel.MainViewModel;
 
 public class McuMgrViewModelFactory implements ViewModelProvider.Factory {
     private final Map<Class<? extends ViewModel>, Callable<? extends ViewModel>> creators;
@@ -27,7 +27,6 @@ public McuMgrViewModelFactory(@NonNull final McuMgrViewModelSubComponent viewMod
         creators = new HashMap<>();
         // we cannot inject view models directly because they won't be bound to the owner's
         // view model scope.
-        creators.put(MainViewModel.class, viewModelSubComponent::mainViewModel);
         creators.put(DeviceStatusViewModel.class, viewModelSubComponent::deviceStatusViewModel);
         creators.put(EchoViewModel.class, viewModelSubComponent::echoViewModel);
         creators.put(ResetViewModel.class, viewModelSubComponent::resetViewModel);