commit 4f7b5a12f02964bcaa80f9c8e0cd19d417ad2aa8
author agsantos <aline.gondimsantos@savoirfairelinux.com> Wed Jul 08 16:18:07 2020 -0400
committer agsantos <aline.gondimsantos@savoirfairelinux.com> Wed Sep 16 11:42:56 2020 -0400
tree 62fe71c8d83b802351a7d180842353db4d5bf99d
parent 4d495c98e5d9fa45e4f112b693d7ff6d8432ce8c

plugin: handle mediaHandlers for different callIDs

Change-Id: I79b5fd9998175e3b9e58973cf9ca16faf08da482

ring-android/app/src/main/java/cx/ring/fragments/CallFragment.java

diff --git a/ring-android/app/src/main/java/cx/ring/fragments/CallFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/CallFragment.java
index 436b368..8547999 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/CallFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/CallFragment.java
@@ -315,6 +315,7 @@
         }else {
             if (binding.pluginPreviewContainer.getVisibility() == View.VISIBLE) {
                 restartPreview = true;
+                presenter.stopPlugin();
             }
         }
     }
@@ -1328,6 +1329,8 @@
                         .putExtra(KEY_CONF_ID, conferenceId),
                 CallFragment.REQUEST_CODE_ADD_PARTICIPANT);
     }
+
+    @Override
     public void toggleCallMediaHandler(String id, boolean toggle) {
         Ringservice.toggleCallMediaHandler(id, toggle);
     }
@@ -1449,7 +1452,6 @@
                 if (position > 0) {
                     String callMediaId = callMediaHandlers.get(position-1);
                     presenter.startPlugin(callMediaId);
-                    //toggleCallMediaHandler(callMediaId, true);
                 }
             }
 
@@ -1458,7 +1460,7 @@
                 String callMediaId = callMediaHandlers.
                         get(previousPluginPosition-1);
 
-                toggleCallMediaHandler(callMediaId, false);
+                presenter.toggleCallMediaHandler(callMediaId, false);
                 rp.scrollToPosition(previousPluginPosition);
             }
             presenter.stopPlugin();
@@ -1483,13 +1485,13 @@
          */
         if (previousPluginPosition > 0) {
             String callMediaId = callMediaHandlers.get(previousPluginPosition-1);
-            toggleCallMediaHandler(callMediaId, false);
+            presenter.toggleCallMediaHandler(callMediaId, false);
         }
 
         if (position > 0) {
             previousPluginPosition = position;
             String callMediaId = callMediaHandlers.get(position-1);
-            toggleCallMediaHandler(callMediaId, true);
+            presenter.toggleCallMediaHandler(callMediaId, true);
         }
     }
 
@@ -1507,7 +1509,7 @@
              */
             if (previousPluginPosition > 0) {
                 String callMediaId = callMediaHandlers.get(previousPluginPosition-1);
-                toggleCallMediaHandler(callMediaId, false);
+                presenter.toggleCallMediaHandler(callMediaId, false);
                 rp.scrollToPosition(previousPluginPosition);
             }