capacitor-plugin-vonage 0.0.7 → 0.0.9

package/CapacitorPluginVonage.podspec

@@ -14,7 +14,7 @@ Pod::Spec.new do |s|
   s.ios.deployment_target  = '13.0'
   s.dependency 'Capacitor'
   #s.dependency 'OpenTok','2.25.0'
-  s.dependency 'OTXCFramework','2.26.2'
+  s.dependency 'OTXCFramework','2.27.0'
   s.swift_version = '5.1'
   s.static_framework = true
 end

package/android/src/main/AndroidManifest.xml

@@ -1,6 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
         <activity android:name="com.managemyhealth.plugin.vonage.VideoCallActivity"
+            android:launchMode="singleTask"
             android:screenOrientation="portrait">
         </activity>
     </application>

package/android/src/main/java/com/managemyhealth/plugin/vonage/VideoCallActivity.java

@@ -57,6 +57,7 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
 
     public Session session;
     private static Bridge staticBridge = null;
+    private  String dummyProfile = "https://www.gravatar.com/avatar/?d=mp";
 
     public static VideoCallActivity instance;
     private Publisher publisher;
@@ -137,88 +138,63 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
     private final Session.SessionListener sessionListener = new Session.SessionListener() {
         @Override
         public void onConnected(Session session) {
-            Log.d(TAG, "onConnected: Connected to session: " + session.getSessionId());
-//            JSObject eventData = new JSObject();
-//            eventData.put("key", "value");
-//            notifyListeners("", eventData);
             publisher = new Publisher.Builder(VideoCallActivity.this).build();
             publisher.setPublisherListener(publisherListener);
             publisher.getRenderer().setStyle(BaseVideoRenderer.STYLE_VIDEO_SCALE, BaseVideoRenderer.STYLE_VIDEO_FILL);
-            Log.d("publisherViewContainer", "publisherViewContainer.toString()");
             FrameLayout Framelayout = findViewById(R.id.publisher_container);
-
             try {
                 if (Framelayout != null) {
-                    Log.d("publisherViewContainer", "Inside if  =======");
                     Framelayout.addView(publisher.getView());
                 }
-            } catch (Exception e) {
-                Log.d("publisherViewContainer", e.toString());
-            }
-
+            } catch (Exception e) {}
             if (publisher.getView() instanceof GLSurfaceView) {
                 ((GLSurfaceView) publisher.getView()).setZOrderOnTop(true);
             }
-
             session.publish(publisher);
         }
-
         @Override
         public void onDisconnected(Session session) {
             notifyObservers("deny");
             if(publisher!=null) {
-
                     publisher.setPublishAudio(false);
                     imageViewMute.setImageResource(R.drawable.microphoneoff);
-
             }
                 if(publisher!=null) {
-
                         publisher.setPublishVideo(false);
                         imageViewCamOff.setImageResource(R.drawable.cameraoff);
                         imageViewCamSwitch.setVisibility(View.GONE);
-
-
-
                 }
                 VideoCallActivity temp = new VideoCallActivity();
                 temp.session = null;
-
-            isTimeron=false;
-
-            Log.d(TAG, "onDisconnected: Disconnected from session: " + session.getSessionId());
-            if (publisher != null) {
+                isTimeron=false;
+                if (publisher != null) {
                 publisher = null;
                 publisherViewContainer.removeAllViews();
             }
-            Intent resultIntent = new Intent();
-            String resultcode = "";
-
-            if(isEndall){
-                resultcode= "111";
-            }else{
-                resultcode = ISPROVIDER ? "999" : "888";
-            }
-            resultIntent.putExtra("result_key", resultcode);
-            setResult(RESULT_OK, resultIntent);
-// setResult(RESULT_CANCELED); // Use this to indicate cancellation
-
-
-            finish();
+                Intent resultIntent = new Intent();
+                String resultcode = "";
+                if(isEndall){
+                    resultcode= "111";
+                }else{
+                    resultcode = ISPROVIDER ? "999" : "888";
+                }
+                resultIntent.putExtra("result_key", resultcode);
+                setResult(RESULT_OK, resultIntent);
+                finish();
         }
-
         @Override
         public void onStreamReceived(Session session, Stream stream) {
 
-            Log.d(TAG, "onStreamReceived: New Stream Received " + stream.getStreamId() + " in session: " + session.getSessionId());
             ProviderViewLayout = findViewById(R.id.providerViewLayout);
             if(ISPROVIDER) {
                 ProviderViewLayout.setVisibility(View.VISIBLE);
             }
             circleAvatar.setVisibility(View.GONE); // Hide the view
             patientStatus.setVisibility(View.GONE); // Hide the view
-            publishernameView.setVisibility(View.GONE); // Hide the view
-
+            publishernameView.setVisibility(View.GONE);// Hide the view
+            admit.setVisibility(View.GONE);
+            deny.setVisibility(View.GONE);
+            sendNotifications.setVisibility(View.GONE);
 
             if (subscriber == null) {
                 subscriber = new Subscriber.Builder(VideoCallActivity.this, stream).build();
@@ -228,22 +204,14 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
                 session.subscribe(subscriber);
                 try {
                     subscriberViewContainer.addView(subscriber.getView());
-                } catch (Exception e) {
-                    Log.d("subscriberViewContainer", e.toString());
-
-                }
+                } catch (Exception e) {}
                 showToast(SUBSCRIBERNAME + "joined the call");
-
             }
         }
 
         @Override
         public void onStreamDropped(Session session, Stream stream) {
-
-            Log.d(TAG, "onStreamDropped: Stream Dropped: " + stream.getStreamId() + " in session: " + session.getSessionId());
-
-                circleAvatar.setVisibility(View.VISIBLE); // Show the view
-
+            circleAvatar.setVisibility(View.VISIBLE); // Show the view
             if(!ISPROVIDER){
                 if(session!=null){
                     session.disconnect();
@@ -273,6 +241,20 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
             finishWithMessage("Session error: " + opentokError.getMessage());
         }
     };
+    SubscriberKit.AudioStatsListener aaa = new SubscriberKit.AudioStatsListener(){
+        @Override
+        public void onAudioStats(SubscriberKit subscriberKit, SubscriberKit.SubscriberAudioStats subscriberAudioStats) {
+
+        }
+    };
+    SubscriberKit.AudioLevelListener sss = new SubscriberKit.AudioLevelListener(){
+
+        @Override
+        public void onAudioLevelUpdated(SubscriberKit subscriberKit, float v) {
+
+        }
+    };
+
     SubscriberKit.VideoListener videoListener = new  SubscriberKit.VideoListener() {
 
         @Override
@@ -424,7 +406,8 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
             }else{
                 ProviderViewLayout.setVisibility(View.GONE);
             }
-            new urltoSource((ImageView) findViewById(R.id.image_view)).execute(profilePicApiUrl);
+            String dummyImage = profilePicApiUrl.length()>10?profilePicApiUrl:dummyProfile;
+            new urltoSource((ImageView) findViewById(R.id.image_view)).execute(dummyImage);
             initializeSession(API_KEY,SESSION_ID , TOKEN);
 
         }
@@ -474,8 +457,6 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
                 if(session!=null){
                     session.disconnect();
                 }
-//                session.cl=
-
             }
         });
 

package/android/src/main/java/com/managemyhealth/plugin/vonage/vonagePlugin.java

@@ -50,9 +50,10 @@ public class vonagePlugin extends Plugin{
     @PluginMethod(returnType = PluginMethod.RETURN_CALLBACK)
     public void setPatientOnlineStatus(PluginCall call) {
         final Boolean isOnline = call.getBoolean("isOnline");
-
+showLog("isOnline");
+showLog(isOnline.toString());
         Handler mainHandler = new Handler(Looper.getMainLooper());
-        Context appCon = this.bridge.getContext();
+
         Runnable myRunnable = new Runnable() {
             @Override
             public void run() {
@@ -121,6 +122,8 @@ public class vonagePlugin extends Plugin{
             intent.putExtra("isProvider", ISPROVIDER);
             intent.putExtra("isPatientOnline", isPatientOnline);
             intent.putExtra("profilePicApiUrl", profilePicApiUrl);
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP|Intent.FLAG_ACTIVITY_SINGLE_TOP);
+
 
             Handler handler = new Handler();
             int delayMillis = 2000;
@@ -134,7 +137,7 @@ public class vonagePlugin extends Plugin{
             }, delayMillis);
 
             eventData.put("isProvider", isProvid);
-            showLog("testing resolve endPluginCal");
+
             endPluginCal.resolve(eventData);
             this.startActivityForResult(call, intent, "onAcitivtyClosed");
             call.setKeepAlive(false);
@@ -148,8 +151,7 @@ public class vonagePlugin extends Plugin{
             JSObject eventData1 = new JSObject();
             eventData1.put("key", "value test value");
             eventData1.put("isProvider", isProvid);
-            showLog("eventData");
-            showLog(eventData1.toString());
+
         handler.postDelayed(new Runnable() {
             @Override
             public void run() {
@@ -238,7 +240,7 @@ public class vonagePlugin extends Plugin{
 //        session.connect(token);
 //    }
     private void showLog(String log){
-        Log.d(Tag,log);
+//        Log.d(Tag,log);
     }
     private void test(PluginCall call){
         JSObject eventData = new JSObject();

package/android/src/main/res/layout/video_call_layout.xml

@@ -58,7 +58,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="bottom|start"
                     android:paddingBottom="100dp"
-                    android:paddingLeft="10dp"
+                    android:paddingStart="10dp"
                     android:text="00:00:00"
                     android:visibility="visible"
                     android:textColor="@android:color/white"
@@ -70,10 +70,8 @@
                     android:layout_height="120dp"
                     android:layout_gravity="bottom|end"
                     android:layout_marginEnd="16dp"
-                    android:layout_marginRight="16dp"
                     android:layout_marginBottom="80dp"
                     android:background="#9b9c98"
-                    android:layout_below="@id/publisherName"
 
                     android:padding="2dp" >
                     <TextView

package/ios/Plugin/VideoChatViewController.swift

@@ -48,7 +48,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     var timerLabel = UILabel()
     var subscriberImg = UIImageView()
     var counter = 0
-    var timer = Timer()
+    var timer : Timer?
     var activityView: UIActivityIndicatorView?
     override func viewDidLoad() {
         
@@ -104,16 +104,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         NotificationCenter.default.addObserver(self, selector: #selector(deviceOrientationDidChange), name: UIDevice.orientationDidChangeNotification, object: nil)
         NotificationCenter.default.addObserver(self, selector: #selector(setPatientOnlineStatus), name: NSNotification.Name ("PatientOnlineStatus"), object: nil)
         NotificationCenter.default.addObserver(self,selector:#selector(endVideoCall(_:)),name: NSNotification.Name ("EndVideoCall"),object: nil)
-//        DispatchQueue.main.asyncAfter(deadline: .now() + 1.0, execute: {
-//
-//            self.connectToAnOpenTokSession()
-//        })
-//        if(isVideoMute){
-//            subscriberImg.isHidden = true
-//        }else{
-//            subscriberImg.isHidden = false
-//        }
-       // turnOnAndOffVideo()
+
     }
     func showActivityIndicator() {
         activityView = UIActivityIndicatorView(style: .large)
@@ -132,11 +123,14 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         print("viewDidDisappear")
         super.viewDidDisappear(animated)
         let userInfo = ["userInfo": ["isProvider": self.isProvider]]
-        NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
-        
-       // NotificationCenter.default.removeObserver(self, name:  NSNotification.Name("EndVideoCall"), object: nil)
+        if(!isCallEnded){
+            NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
+            
+            // NotificationCenter.default.removeObserver(self, name:  NSNotification.Name("EndVideoCall"), object: nil)
+            
+            NotificationCenter.default.post(name: NSNotification.Name("RemoveObservers"),object: nil,userInfo: userInfo)
+        }
         NotificationCenter.default.removeObserver(self)
-        NotificationCenter.default.post(name: NSNotification.Name("RemoveObservers"),object: nil,userInfo: userInfo)
     }
     @objc func appMovedToBackground() {
         print("App moved to background!")
@@ -177,13 +171,23 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         NotificationCenter.default.removeObserver(self, name:  NSNotification.Name("EndVideoCall"), object: nil)
     }
     func startTimer(){
-        timer.invalidate()
+//        if(timer != nil && timer.isValid){
+//            timer.invalidate()
+//        }
+        if let timerObj = timer, timerObj.isValid{
+            timer?.invalidate()
+        }
         timer = Timer.scheduledTimer(timeInterval: 1.0, target: self, selector: #selector(timerAction), userInfo: nil, repeats: true)
     }
     func stopTimer(){
-        if(timer.isValid){
-            timer.invalidate()
+//        if(timer != nil && timer.isValid){
+//            timer.invalidate()
+//            counter = 0
+//        }
+        if let timerObj = timer, timerObj.isValid{
+            timer?.invalidate()
             counter = 0
+            timer = nil
         }
         
     }
@@ -440,10 +444,11 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         let userInfo = ["userInfo": ["isProvider": isProvider]]
        
         NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
-        self.session?.disconnect(nil)
-        self.stopTimer()
-        self.dismiss(animated: true, completion: nil)
-        NotificationCenter.default.post(name: NSNotification.Name("RemoveObservers"),object: nil,userInfo: userInfo)
+//        self.session?.disconnect(nil)
+//        self.stopTimer()
+//        self.dismiss(animated: true, completion: nil)
+//        NotificationCenter.default.post(name: NSNotification.Name("RemoveObservers"),object: nil,userInfo: userInfo)
+        self.endVonageCall()
     }
     
     @objc func callBtnbuttonClicked() {
@@ -565,6 +570,9 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
             return
         }
         
+        if !stream.hasAudio {
+            print("Stream audio \(stream.hasAudio)")
+        }
         self.subscriber = subscriber
         var error: OTError?
         session.subscribe(subscriber, error: &error)
@@ -685,12 +693,10 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         NotificationCenter.default.post(name: NSNotification.Name("RemoveObservers"),object: nil,userInfo: userInfo)
         DispatchQueue.main.async {
             print("video ended called")
-            self.session?.disconnect(nil)
-            
 //            self.publisher?.publishVideo = false
             self.publisher?.videoCapture?.stop()
 //            self.publisher?.publishAudio = false
-            
+            self.session?.disconnect(nil)
             self.cleanupSubscriber()
             self.cleanupPublisher()
             self.stopTimer()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "capacitor-plugin-vonage",
-  "version": "0.0.7",
+  "version": "0.0.9",
   "description": "opentok sdk capacitor plugin",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",