Recover if expand/collapse panels is not available

Some devices don't have the required method. Recover gracefully without crashing the server. Fixes <#506>.
Genymobile · May 4, 2019 · c8338b2 · c8338b2
1 parent 2837c6e
commit c8338b2
Showing 1 changed file with 22 additions and 10 deletions.
diff --git a/server/src/main/java/com/genymobile/scrcpy/wrappers/StatusBarManager.java b/server/src/main/java/com/genymobile/scrcpy/wrappers/StatusBarManager.java
@@ -2,38 +2,50 @@
 
 import android.os.IInterface;
 
+import com.genymobile.scrcpy.Ln;
+
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
 public class StatusBarManager {
 
     private final IInterface manager;
-    private final Method expandNotificationsPanelMethod;
-    private final Method collapsePanelsMethod;
+    private Method expandNotificationsPanelMethod;
+    private Method collapsePanelsMethod;
 
     public StatusBarManager(IInterface manager) {
         this.manager = manager;
-        try {
-            expandNotificationsPanelMethod = manager.getClass().getMethod("expandNotificationsPanel");
-            collapsePanelsMethod = manager.getClass().getMethod("collapsePanels");
-        } catch (NoSuchMethodException e) {
-            throw new AssertionError(e);
-        }
     }
 
     public void expandNotificationsPanel() {
+        if (expandNotificationsPanelMethod == null) {
+            try {
+                expandNotificationsPanelMethod = manager.getClass().getMethod("expandNotificationsPanel");
+            } catch (NoSuchMethodException e) {
+                Ln.e("ServiceBarManager.expandNotificationsPanel() is not available on this device");
+                return;
+            }
+        }
         try {
             expandNotificationsPanelMethod.invoke(manager);
         } catch (InvocationTargetException | IllegalAccessException e) {
-            throw new AssertionError(e);
+            Ln.e("Cannot invoke ServiceBarManager.expandNotificationsPanel()", e);
         }
     }
 
     public void collapsePanels() {
+        if (collapsePanelsMethod == null) {
+            try {
+                collapsePanelsMethod = manager.getClass().getMethod("collapsePanels");
+            } catch (NoSuchMethodException e) {
+                Ln.e("ServiceBarManager.collapsePanels() is not available on this device");
+                return;
+            }
+        }
         try {
             collapsePanelsMethod.invoke(manager);
         } catch (InvocationTargetException | IllegalAccessException e) {
-            throw new AssertionError(e);
+            Ln.e("Cannot invoke ServiceBarManager.collapsePanels()", e);
         }
     }
 }