camera app - fix update from notification

Quentin-xue · Jun 26, 2019 · 160efb7 · 160efb7
1 parent 33c488e
commit 160efb7
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 5 deletions.
diff --git a/...rs/android/librealsense/src/main/java/com/intel/realsense/librealsense/DeviceWatcher.java b/...rs/android/librealsense/src/main/java/com/intel/realsense/librealsense/DeviceWatcher.java
@@ -19,8 +19,11 @@ class DeviceWatcher extends LrsClass {
     private final List<DeviceListener> mAppDeviceListener;
 
     public synchronized void addListener(DeviceListener deviceListener){
-        if(!mAppDeviceListener.contains(deviceListener))
+        if(!mAppDeviceListener.contains(deviceListener)) {
             mAppDeviceListener.add(deviceListener);
+            if(getDeviceCount() > 0)
+                deviceListener.onDeviceAttach();
+        }
     }
 
     public synchronized void removeListener(DeviceListener deviceListener){

diff --git a/wrappers/android/tools/camera/src/main/java/com/intel/realsense/camera/DetachedActivity.java b/wrappers/android/tools/camera/src/main/java/com/intel/realsense/camera/DetachedActivity.java
@@ -91,14 +91,18 @@ public void onRequestPermissionsResult(int requestCode, String permissions[], in
     @Override
     protected void onResume() {
         super.onResume();
-
         if(mPermissionsGrunted) {
             RsContext.init(getApplicationContext());
-            mRsContext.setDevicesChangedCallback(mListener);
-            validatedDevice();
+            mRsContext.setDevicesChangedCallback(mDetachedListener);
         }
     }
 
+    @Override
+    protected void onPause() {
+        super.onPause();
+        mRsContext.setDevicesChangedCallback(mAttachListener);
+    }
+
     private synchronized void validatedDevice(){
         if(mUpdating)
             return;
@@ -178,12 +182,20 @@ public void run() {
         });
     }
 
-    private DeviceListener mListener = new DeviceListener() {
+    private DeviceListener mDetachedListener = new DeviceListener() {
         @Override
         public void onDeviceAttach() {
             validatedDevice();
         }
 
+        @Override
+        public void onDeviceDetach() { }
+    };
+
+    private DeviceListener mAttachListener = new DeviceListener() {
+        @Override
+        public void onDeviceAttach() { }
+
         @Override
         public void onDeviceDetach() {
             finish();