capacitor-plugin-vonage 0.0.8 → 0.1.0

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/CustomToastUtils.java

@@ -0,0 +1,28 @@
+package com.managemyhealth.plugin.vonage;
+
+import android.content.Context;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.TextView;
+import android.widget.Toast;
+
+public class CustomToastUtils {
+
+    public static void showGreenToast(Context context, String message) {
+        LayoutInflater inflater = LayoutInflater.from(context);
+        View layout = inflater.inflate(R.layout.custom_toast_green_layout, null);
+
+        TextView text = layout.findViewById(R.id.toastView);
+        text.setText(message);
+
+        Toast toast = new Toast(context);
+        toast.setDuration(Toast.LENGTH_SHORT);
+        toast.setView(layout);
+
+        // Set toast position to top right corner
+        toast.setGravity(Gravity.TOP | Gravity.END, 0, 0);
+
+        toast.show();
+    }
+}

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

@@ -3,6 +3,9 @@ package com.managemyhealth.plugin.vonage;
 
 
 import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.app.Application;
+import android.content.Context;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.os.AsyncTask;
@@ -13,8 +16,10 @@ import android.graphics.BitmapFactory;
 import android.opengl.GLSurfaceView;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
 import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.Button;
 import android.widget.FrameLayout;
@@ -51,12 +56,13 @@ import pub.devrel.easypermissions.AfterPermissionGranted;
 import pub.devrel.easypermissions.EasyPermissions;
 
 
-public class VideoCallActivity extends AppCompatActivity implements EasyPermissions.PermissionCallbacks  {
+public class VideoCallActivity extends AppCompatActivity implements EasyPermissions.PermissionCallbacks  , Application.ActivityLifecycleCallbacks{
     private static final String TAG = VideoCallActivity.class.getSimpleName();
     private static final int PERMISSIONS_REQUEST_CODE = 124;
 
     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;
@@ -66,6 +72,7 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
     boolean isPatientOnline = false;
     boolean isMuted = false;
     boolean isCamOff = false;
+    boolean isCallinprogress = false;
     public boolean temptest = false;
     boolean isTimeron = false;
     boolean isEndall = false;
@@ -73,11 +80,13 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
     private FrameLayout publisherViewContainer;
     private LinearLayout ProviderViewLayout;
     private FrameLayout subscriberViewContainer;
+    private  TextView publisherNameTextView;
     private FloatingActionButton fabCameraOff;
     private ImageView imageViewEndcall;
     private ImageView imageViewMute;
     private ImageView imageViewCamOff;
     private ImageView circleAvatar;
+    private boolean isAppInForeground;
 
     private ImageView imageViewCamSwitch;
     public static Button sendNotifications ;
@@ -86,6 +95,7 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
     public static Button admit;
     public static Button deny ;
 
+
     private static final int LOG_INTERVAL_MILLIS = 1000; // Log every 100 milliseconds
 
     private final Handler handler = new Handler();
@@ -120,6 +130,7 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
         public void onStreamCreated(PublisherKit publisherKit, Stream stream) {
             Log.d(TAG, "onStreamCreated: Publisher Stream Created. Own stream " + stream.getStreamId());
 
+
         }
 
         @Override
@@ -137,88 +148,68 @@ 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());
-            }
+                    LayoutInflater inflater = LayoutInflater.from(getApplicationContext());
+                    View xmlDefinedView = inflater.inflate(R.layout.video_call_layout, Framelayout, false);
+                    Framelayout.addView(xmlDefinedView);
+                    publisherNameTextView.bringToFront();
 
+                }
+            } 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());
+            isCallinprogress = true;
             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 +219,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 +256,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
@@ -389,7 +386,7 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
             ISPROVIDER = intent.getBooleanExtra("isProvider",false);
             publisherViewContainer = findViewById(R.id.publisher_container);
             subscriberViewContainer = findViewById(R.id.subscriber_container);
-            TextView publisherNameTextView = findViewById(R.id.publisherName);
+            publisherNameTextView = findViewById(R.id.publisherName);
             publishernameView = findViewById(R.id.publisherNameView);
             TextView subscriberNameTextView = findViewById(R.id.subscriberName);
 
@@ -424,9 +421,11 @@ 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 +473,6 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
                 if(session!=null){
                     session.disconnect();
                 }
-//                session.cl=
-
             }
         });
 
@@ -677,19 +674,23 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
 
     private void showToast(String message) {
         try{
-            Toast toast = Toast.makeText(this, message, Toast.LENGTH_LONG);
-            View view = toast.getView();
-            int color = Color.parseColor("#1fc600");
-            int colorText = Color.parseColor("#ffffff");
-            view.getBackground().setColorFilter(Color.GREEN, PorterDuff.Mode.SRC_IN);
-            TextView text = view.findViewById(android.R.id.message);
-            text.setTextColor(Color.BLACK);
-            toast.setGravity(Gravity.TOP, 0, 0);
-            toast.show();
+            if(isAppInForeground()){
+            showGreenToast(getApplicationContext(),message);
+            }
+//            Toast toast = Toast.makeText(this, message, Toast.LENGTH_LONG);
+//            View view = toast.getView();
+//            int color = Color.parseColor("#1fc600");
+//            int colorText = Color.parseColor("#ffffff");
+//            view.getBackground().setColorFilter(Color.GREEN, PorterDuff.Mode.SRC_IN);
+//            TextView text = view.findViewById(android.R.id.message);
+//            text.setTextColor(Color.BLACK);
+//            toast.setGravity(Gravity.TOP, 0, 0);
+//            toast.show();
         }catch(Exception e){
             Log.d("toastlogex",e.toString());
         }
     }
+
     private void finishWithMessage(String message) {
         Log.e(TAG, message);
 //        Toast.makeText(this, message, Toast.LENGTH_LONG).show();
@@ -712,33 +713,54 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
         Log.d("patientStatusChanged2", String.valueOf(isOnline));
         Log.d("patientStatusChanged2", String.valueOf(isOnline));
 
-        runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                temptest= isOnline;
-                if(isOnline){
-                    Log.d("isOnline", String.valueOf(isOnline));
-
-                    patientStatus.setText("WAITING");
-                    sendNotifications.setVisibility(View.GONE);
-                    admit.setVisibility(View.VISIBLE);
-                    deny.setVisibility(View.VISIBLE);
-                    patientStatus.setBackgroundResource(R.color.waiting);
+        if(!isCallinprogress){
+            runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    temptest = isOnline;
+                    if (isOnline) {
+                        Log.d("isOnline", String.valueOf(isOnline));
+
+                        patientStatus.setText("WAITING");
+                        sendNotifications.setVisibility(View.GONE);
+                        admit.setVisibility(View.VISIBLE);
+                        deny.setVisibility(View.VISIBLE);
+                        patientStatus.setBackgroundResource(R.color.waiting);
 //                    patientStatus.setBackgroundColor(getResources().getColor(R.color.waiting));
-                }else{
-                    Log.d("OFFLINE", String.valueOf(isOnline));
-                    patientStatus.setText("OFFLINE");
-                    admit.setVisibility(View.GONE);
-                    deny.setVisibility(View.GONE);
-                    sendNotifications.setVisibility(View.VISIBLE);
-                    patientStatus.setText("OFFLINE");
-                    patientStatus.setBackgroundResource(R.color.offline);
+                    } else {
+                        Log.d("OFFLINE", String.valueOf(isOnline));
+                        patientStatus.setText("OFFLINE");
+                        admit.setVisibility(View.GONE);
+                        deny.setVisibility(View.GONE);
+                        sendNotifications.setVisibility(View.VISIBLE);
+                        patientStatus.setText("OFFLINE");
+                        patientStatus.setBackgroundResource(R.color.offline);
 //                    patientStatus.setBackgroundColor(getResources().getColor(R.color.offline));
+                    }
+
+
                 }
+            });
+        }
+    }
+    public static void showGreenToast(Context context, String message) {
+        LayoutInflater inflater = LayoutInflater.from(context);
+        View layout = inflater.inflate(R.layout.custom_toast_green_layout, null);
 
+        TextView text = layout.findViewById(R.id.toastView);
+        text.setText(message);
 
-            }
-        });
+        Toast toast = new Toast(context);
+        toast.setDuration(Toast.LENGTH_SHORT);
+        toast.setView(layout);
+
+        // Set toast position to top right corner
+        toast.setGravity(Gravity.TOP | Gravity.END, 0, 0);
+
+        toast.show();
+    }
+    private boolean isAppInForeground() {
+        return  isAppInForeground;
     }
 
     public void notifyObservers(String value) {
@@ -746,6 +768,43 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
         temp.update(value);
     }
 
+    @Override
+    public void onActivityCreated(@NonNull Activity activity, @androidx.annotation.Nullable Bundle bundle) {
+
+    }
+
+    @Override
+    public void onActivityStarted(@NonNull Activity activity) {
+
+    }
+
+    @Override
+    public void onActivityResumed(@NonNull Activity activity) {
+        Log.d("isAppInForeground", String.valueOf(isAppInForeground));
+        isAppInForeground = true;
+    }
+
+    @Override
+    public void onActivityPaused(@NonNull Activity activity) {
+        Log.d("isAppInForeground", String.valueOf(isAppInForeground));
+        isAppInForeground = false;
+    }
+
+    @Override
+    public void onActivityStopped(@NonNull Activity activity) {
+
+    }
+
+    @Override
+    public void onActivitySaveInstanceState(@NonNull Activity activity, @NonNull Bundle bundle) {
+
+    }
+
+    @Override
+    public void onActivityDestroyed(@NonNull Activity activity) {
+
+    }
+
     private class urltoSource extends AsyncTask<String, Void, Bitmap> {
         ImageView imageView;
         public urltoSource(ImageView imageView) {

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/custom_toast_green_layout.xml

@@ -0,0 +1,18 @@
+<!-- custom_toast_green_layout.xml -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:padding="16dp"
+    android:background="#00FF00">
+
+    <TextView
+        android:id="@+id/toastView"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Custom Toast"
+        android:textColor="#0B6623"
+        android:textStyle="bold"
+        android:layout_gravity="center_horizontal"/>
+</LinearLayout>

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,24 +70,29 @@
                     android:layout_height="120dp"
                     android:layout_gravity="bottom|end"
                     android:layout_marginEnd="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_marginBottom="80dp"
+                    android:layout_marginBottom="110dp"
                     android:background="#9b9c98"
-                    android:layout_below="@id/publisherName"
 
                     android:padding="2dp" >
-                    <TextView
-                        android:id="@+id/subscriberName"
-                        android:layout_width="100dp"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_vertical|bottom"
-                        android:paddingBottom="6dp"
-                        android:text="@string/subscriber_name"
-                        android:textColor="@android:color/white"
-                        android:visibility="visible"
-                        android:textSize="12sp" />
+
 
                 </FrameLayout>
+                <TextView
+                    android:id="@+id/subscriberName"
+                    android:layout_width="100dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|end"
+                android:paddingBottom="6dp"
+                android:layout_marginEnd="16dp"
+                android:layout_marginBottom="80dp"
+                    android:maxLines="1"
+                    android:ellipsize="end"
+                android:text="@string/subscriber_name"
+                android:textColor="@android:color/white"
+                android:visibility="visible"
+                    android:gravity="center"
+                android:textSize="12sp" />
+
 
                 <de.hdodenhof.circleimageview.CircleImageView
                     xmlns:app="http://schemas.android.com/apk/res-auto"

package/ios/Plugin/VideoChatViewController.swift

@@ -48,8 +48,9 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     var timerLabel = UILabel()
     var subscriberImg = UIImageView()
     var counter = 0
-    var timer = Timer()
+    var timer : Timer?
     var activityView: UIActivityIndicatorView?
+    weak var delegate: VonageSDKInteractionDelegate?
     override func viewDidLoad() {
         
         super.viewDidLoad()
@@ -122,14 +123,13 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     override func viewDidDisappear(_ animated: Bool) {
         print("viewDidDisappear")
         super.viewDidDisappear(animated)
-        let userInfo = ["userInfo": ["isProvider": self.isProvider]]
-        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)
-        }
+//        let userInfo = ["userInfo": ["isProvider": self.isProvider]]
+//        if(!isCallEnded){
+////            NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
+////
+////            NotificationCenter.default.post(name: NSNotification.Name("RemoveObservers"),object: nil,userInfo: userInfo)
+//            delegate?.videoCallEnded(userInfo)
+//        }
         NotificationCenter.default.removeObserver(self)
     }
     @objc func appMovedToBackground() {
@@ -171,15 +171,23 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         NotificationCenter.default.removeObserver(self, name:  NSNotification.Name("EndVideoCall"), object: nil)
     }
     func startTimer(){
-        if(timer != nil && timer.isValid){
-            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 != nil && 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
         }
         
     }
@@ -362,14 +370,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         
         
     }
-     deinit{
-        if(!isCallEnded){
-            let userInfo = ["userInfo": ["isProvider": self.isProvider]]
-            NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
-            NotificationCenter.default.post(name: NSNotification.Name("RemoveObservers"),object: nil,userInfo: userInfo)
-        }
-        
-    }
+
     func patientStatusChanged(){
         if(isProvider && isPatientOnLine){
             centerView.isHidden = false
@@ -407,7 +408,8 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         subscriberNameLabel.isHidden = false
         subscriberStatusLabel.text = "Please Wait.."
         let userInfo = ["userInfo": ["isProvider": isProvider]]
-        NotificationCenter.default.post(name: NSNotification.Name("SendNotification"),object: nil,userInfo: userInfo)
+//        NotificationCenter.default.post(name: NSNotification.Name("SendNotification"),object: nil,userInfo: userInfo)
+        delegate?.videoCallSendNotification(userInfo)
 //        self.session?.disconnect(nil)
 //        self.stopTimer()
 //        self.dismiss(animated: true, completion: nil)
@@ -428,14 +430,16 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
 //        self.stopTimer()
 //        self.dismiss(animated: true, completion: nil)
         let userInfo = ["userInfo": ["isProvider": isProvider]]
-        NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoStarted),object: nil,userInfo: userInfo)
+//        NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoStarted),object: nil,userInfo: userInfo)
+        delegate?.videoCallStarted(userInfo)
     }
     @objc func denybuttonClicked() {
         print("deny button clicked")
         centerView.isHidden = true
         let userInfo = ["userInfo": ["isProvider": isProvider]]
        
-        NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
+       // NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
+        delegate?.videoCallEnded(userInfo)
 //        self.session?.disconnect(nil)
 //        self.stopTimer()
 //        self.dismiss(animated: true, completion: nil)
@@ -446,7 +450,8 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     @objc func callBtnbuttonClicked() {
         
         let userInfo = ["userInfo": ["isProvider": isProvider]]
-        NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
+       // NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
+        delegate?.videoCallEnded(userInfo)
         self.endVonageCall()
     }
     
@@ -545,11 +550,12 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     func sessionDidDisconnect(_ session: OTSession) {
         print("The client disconnected from the OpenTok session.")
        // self.session?.disconnect(nil)
-        if(!isCallEnded){
-            let userInfo = ["userInfo": ["isProvider": self.isProvider]]
-            NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
-        }
-        self.dismiss(animated: true, completion: nil)
+//        if(!isCallEnded){
+//            let userInfo = ["userInfo": ["isProvider": self.isProvider]]
+//           // NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
+//            delegate?.videoCallEnded(userInfo)
+//        }
+//        self.dismiss(animated: true, completion: nil)
     }
     
     func session(_ session: OTSession, didFailWithError error: OTError) {
@@ -561,10 +567,6 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         guard let subscriber = subscriber else {
             return
         }
-        
-        if !stream.hasAudio {
-            print("Stream audio \(stream.hasAudio)")
-        }
         self.subscriber = subscriber
         var error: OTError?
         session.subscribe(subscriber, error: &error)
@@ -582,6 +584,9 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         if(stream.videoType == .screen){
             subscriberView.accessibilityValue = "from screen"
         }
+        adminBtn.isHidden = true
+        denyBtn.isHidden = true
+        sendNotificationBtn.isHidden = true
         remoteView.addSubview(subscriberView)
     }
     
@@ -596,7 +601,8 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         if let subStream = subscriber?.stream, subStream.streamId == stream.streamId,!isProvider, stream.videoType != .screen {
                   // cleanupSubscriber()
             let userInfo = ["userInfo": ["isProvider": isProvider]]
-            NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
+           // NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
+            delegate?.videoCallEnded(userInfo)
            // self.session?.disconnect(nil)
             self.endVonageCall()
             //self.dismiss(animated: true, completion: nil)
@@ -676,26 +682,27 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         isCallEnded = true
         let userInfo = ["userInfo": ["isProvider": self.isProvider]]
         
-        NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
+       // NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
+        delegate?.videoCallEnded(userInfo)
         endVonageCall()
     }
     fileprivate func endVonageCall(){
         isCallEnded = true
-        let userInfo = ["userInfo": ["isProvider": self.isProvider]]
-        NotificationCenter.default.post(name: NSNotification.Name("RemoveObservers"),object: nil,userInfo: userInfo)
-        DispatchQueue.main.async {
+        //let userInfo = ["userInfo": ["isProvider": self.isProvider]]
+       // NotificationCenter.default.post(name: NSNotification.Name("RemoveObservers"),object: nil,userInfo: userInfo)
+       // DispatchQueue.main.async {
             print("video ended called")
 //            self.publisher?.publishVideo = false
-            self.publisher?.videoCapture?.stop()
+//            self.publisher?.videoCapture?.stop()
 //            self.publisher?.publishAudio = false
             self.session?.disconnect(nil)
-            self.cleanupSubscriber()
-            self.cleanupPublisher()
+           // self.cleanupSubscriber()
+            //self.cleanupPublisher()
             self.stopTimer()
             self.dismiss(animated: true) {
                 print("video ended")
             }
-        }
+        //}
     }
     fileprivate func cleanupSubscriber() {
            subscriber?.view?.removeFromSuperview()

package/ios/Plugin/vonagePlugin.swift

@@ -6,7 +6,7 @@ import Capacitor
  * here: https://capacitorjs.com/docs/plugins/ios
  */
 @objc(vonagePlugin)
-public class vonagePlugin: CAPPlugin {
+public class vonagePlugin: CAPPlugin,VonageSDKInteractionDelegate {
     @objc func openVideoCallWindow(_ call: CAPPluginCall) {
        
         let sessionId = call.getString("sessionId") ?? ""
@@ -30,24 +30,14 @@ public class vonagePlugin: CAPPlugin {
             vc.profilePicApiUrl = profilePhoto
            // vc.videoCallParam = value
             vc.modalPresentationStyle = .fullScreen
+            vc.delegate = self
             self.bridge?.viewController?.present(vc, animated: true, completion: nil)
         }
-        NotificationCenter.default.addObserver(self,selector:#selector(videoEnded(_:)),name: NSNotification.Name (NotificationNames.videoEnded),object: nil)
-        NotificationCenter.default.addObserver(self,selector:#selector(videoStarted(_:)),name: NSNotification.Name (NotificationNames.videoStarted),object: nil)
-        NotificationCenter.default.addObserver(self,selector:#selector(sendNotification(_:)),name: NSNotification.Name ("SendNotification"),object: nil)
-        NotificationCenter.default.addObserver(self,selector:#selector(removeObservers(_:)),name: NSNotification.Name ("RemoveObservers"),object: nil)
-//        if let visibleViewCtrl = UIApplication.topViewController() {
-//            // do whatever you want with your `visibleViewCtrl`
-//            print(visibleViewCtrl)
-//            DispatchQueue.main.async(execute: {
-//                let vc = VideoChatViewController()
-//                vc.kApiKey = apiKey
-//                vc.kToken = token
-//                vc.kSessionId = sessionId
-//               // vc.videoCallParam = value
-//                vc.modalPresentationStyle = .fullScreen
-//                visibleViewCtrl.present(vc, animated: true, completion: nil)})
-//        }
+//        NotificationCenter.default.addObserver(self,selector:#selector(videoEnded(_:)),name: NSNotification.Name (NotificationNames.videoEnded),object: nil)
+//        NotificationCenter.default.addObserver(self,selector:#selector(videoStarted(_:)),name: NSNotification.Name (NotificationNames.videoStarted),object: nil)
+//        NotificationCenter.default.addObserver(self,selector:#selector(sendNotification(_:)),name: NSNotification.Name ("SendNotification"),object: nil)
+//        NotificationCenter.default.addObserver(self,selector:#selector(removeObservers(_:)),name: NSNotification.Name ("RemoveObservers"),object: nil)
+
         
         call.resolve(["value": "Video call initiated"])
     }
@@ -78,6 +68,15 @@ public class vonagePlugin: CAPPlugin {
     @objc func removeObservers(_ notification: Notification){
         NotificationCenter.default.removeObserver(self)
     }
+    func videoCallStarted(_ data: [String: Any]){
+        self.notifyListeners(NotificationNames.videoStarted, data: data)
+    }
+    func videoCallEnded(_ data: [String: Any]){
+        self.notifyListeners(NotificationNames.videoEnded, data: data)
+    }
+    func videoCallSendNotification(_ data: [String: Any]){
+        self.notifyListeners("SendNotification", data: data)
+    }
 }
 extension UIApplication {
     class func topViewController(base: UIViewController? = UIApplication.shared.keyWindow?.rootViewController) -> UIViewController? {
@@ -102,3 +101,8 @@ struct NotificationNames {
     static let videoStarted = "VideoCallStarted"
     static let videoEnded = "VideoCallEnded"
 }
+protocol VonageSDKInteractionDelegate: AnyObject {
+func videoCallStarted(_ data: [String: Any])
+func videoCallEnded(_ data: [String: Any])
+func videoCallSendNotification(_ data: [String: Any])
+}

package/package.json

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

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

@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context=".VideoCallActivity">
-
-    <FrameLayout
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            android:background="#DDDDDD"
-           app:layout_constraintTop_toTopOf="parent">
-
-        <FrameLayout
-                android:id="@+id/subscriber_container"
-                android:layout_width="fill_parent"
-                android:layout_height="fill_parent" />
-
-        <FrameLayout
-                android:id="@+id/publisher_container"
-                android:layout_width="90dp"
-                android:layout_height="120dp"
-                android:layout_gravity="bottom|end"
-                android:layout_marginEnd="16dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginBottom="16dp"
-                android:background="#FFFFFF"
-                android:padding="2dp" />
-
-    </FrameLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>