capacitor-plugin-vonage 0.0.2 → 0.0.4

package/README.md

@@ -15,6 +15,7 @@ npx cap sync
 
 * [`echo(...)`](#echo)
 * [`openVideoCallWindow(...)`](#openvideocallwindow)
+* [`endVideoCall()`](#endvideocall)
 * [`addListener([eventName: 'VideoCallEnded', listenerFunc: (info: any) => void] | [eventName: 'VideoCallStarted', listenerFunc: (info: any) => void], ...)`](#addlistenereventname-videocallended-listenerfunc-info-any--void--eventname-videocallstarted-listenerfunc-info-any--void)
 * [Interfaces](#interfaces)
 * [Type Aliases](#type-aliases)
@@ -54,6 +55,17 @@ openVideoCallWindow(options: Object) => Promise<{ value: any; }>
 --------------------
 
 
+### endVideoCall()
+
+```typescript
+endVideoCall() => Promise<{ value: string; }>
+```
+
+**Returns:** <code>Promise&lt;{ value: string; }&gt;</code>
+
+--------------------
+
+
 ### addListener([eventName: 'VideoCallEnded', listenerFunc: (info: any) => void] | [eventName: 'VideoCallStarted', listenerFunc: (info: any) => void], ...)
 
 ```typescript

package/android/build.gradle

@@ -51,7 +51,6 @@ repositories {
 dependencies {
     implementation 'com.google.android.material:material:1.4.0'
     implementation 'pub.devrel:easypermissions:3.0.0'
-    implementation 'com.opentok.android:opentok-android-sdk:2.22.0'
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':capacitor-android')
     implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
@@ -62,7 +61,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.annotation:annotation:1.7.0'
-    implementation 'com.opentok.android:opentok-android-sdk:2.22.2'
+    implementation 'com.opentok.android:opentok-android-sdk:2.26.2'
     androidTestImplementation 'androidx.test:runner:1.5.2'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
 

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">
+        <activity android:name="com.managemyhealth.plugin.vonage.VideoCallActivity"
+            android:screenOrientation="portrait">
         </activity>
     </application>
 </manifest>

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

@@ -1,9 +1,12 @@
 package com.managemyhealth.plugin.vonage;
 
 
-
+import android.annotation.SuppressLint;
+import android.os.AsyncTask;
 import android.app.ActionBar;
 import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
 import android.nfc.Tag;
 import android.opengl.GLSurfaceView;
 import android.os.Bundle;
@@ -32,6 +35,7 @@ import com.opentok.android.SubscriberKit;
 //import com.tokbox.sample.basicvideochat.network.APIService;
 //import com.tokbox.sample.basicvideochat.network.GetSessionResponse;
 
+import java.io.InputStream;
 import java.util.List;
 
 import okhttp3.OkHttpClient;
@@ -47,11 +51,14 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
     private static final String TAG = VideoCallActivity.class.getSimpleName();
     private static final int PERMISSIONS_REQUEST_CODE = 124;
 
-    private Session session;
+    public Session session;
     private Publisher publisher;
+    String SUBSCRIBERNAME ;
+    String PUBLISHERNAME;
     boolean isMuted = false;
     boolean isCamOff = false;
     boolean isTimeron = false;
+    boolean isEndall = false;
     private Subscriber subscriber;
     private FrameLayout publisherViewContainer;
     private FrameLayout subscriberViewContainer;
@@ -79,12 +86,12 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
         public void onError(PublisherKit publisherKit, OpentokError opentokError) {
             finishWithMessage("PublisherKit onError: " + opentokError.getMessage());
         }
+
     };
 
     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");
@@ -121,8 +128,14 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
                 publisherViewContainer.removeAllViews();
             }
             Intent resultIntent = new Intent();
-            String resultcode = ISPROVIDER?"999":"888";
-            resultIntent.putExtra("result_key", resultcode); // Optional: Pass data back to the calling activity
+            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
 
@@ -132,12 +145,14 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
 
         @Override
         public void onStreamReceived(Session session, Stream stream) {
+
             Log.d(TAG, "onStreamReceived: New Stream Received " + stream.getStreamId() + " in session: " + session.getSessionId());
 
             if (subscriber == null) {
                 subscriber = new Subscriber.Builder(VideoCallActivity.this, stream).build();
                 subscriber.getRenderer().setStyle(BaseVideoRenderer.STYLE_VIDEO_SCALE, BaseVideoRenderer.STYLE_VIDEO_FILL);
                 subscriber.setSubscriberListener(subscriberListener);
+                subscriber.setVideoListener(videoListener);
                 session.subscribe(subscriber);
                 try {
                     subscriberViewContainer.addView(subscriber.getView());
@@ -145,6 +160,8 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
                     Log.d("subscriberViewContainer", e.toString());
 
                 }
+                showToast(SUBSCRIBERNAME + "joined the call");
+
             }
         }
 
@@ -160,20 +177,59 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
                     subscriberViewContainer.removeAllViews();
                     Intent resultIntent = new Intent();
                     String resultcode = ISPROVIDER?"999":"888";
-                    resultIntent.putExtra("result_key", resultcode); // Optional: Pass data back to the calling activity
+                    resultIntent.putExtra("result_key", resultcode);
                     setResult(RESULT_OK, resultIntent);
                     finish();
                 }
+            }else{
+                if (subscriber != null) {
+                    subscriber = null;
+                    subscriberViewContainer.removeAllViews();
+                    showToast(SUBSCRIBERNAME + " left the call");
+
+                }
             }
         }
 
+
         @Override
         public void onError(Session session, OpentokError opentokError) {
             finishWithMessage("Session error: " + opentokError.getMessage());
         }
     };
+    SubscriberKit.VideoListener videoListener = new  SubscriberKit.VideoListener() {
+
+        @Override
+        public void onVideoDataReceived(SubscriberKit subscriberKit) {
+
+        }
+
+        @Override
+        public void onVideoDisabled(SubscriberKit subscriberKit, String s) {
+            showToast(SUBSCRIBERNAME + " video disabled");
+
+        }
+
+        @Override
+        public void onVideoEnabled(SubscriberKit subscriberKit, String s) {
+            showToast(SUBSCRIBERNAME + " video enabled");
+
+
+        }
+
+        @Override
+        public void onVideoDisableWarning(SubscriberKit subscriberKit) {
+
+        }
+
+        @Override
+        public void onVideoDisableWarningLifted(SubscriberKit subscriberKit) {
+
+        }
+    };
 
     SubscriberKit.SubscriberListener subscriberListener = new SubscriberKit.SubscriberListener() {
+
         @Override
         public void onConnected(SubscriberKit subscriberKit) {
             Log.d(TAG, "onConnected: Subscriber connected. Stream: " + subscriberKit.getStream().getStreamId());
@@ -182,10 +238,14 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
         @Override
         public void onDisconnected(SubscriberKit subscriberKit) {
             Log.d(TAG, "onDisconnected: Subscriber disconnected. Stream: " + subscriberKit.getStream().getStreamId());
+
         }
 
+
+
         @Override
         public void onError(SubscriberKit subscriberKit, OpentokError opentokError) {
+            showToast(SUBSCRIBERNAME + " failed to connect to the call");
             finishWithMessage("SubscriberKit onError: " + opentokError.getMessage());
         }
     };
@@ -201,6 +261,13 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
         }
         }
 
+    @Override
+    public void onBackPressed() {
+        Log.d("onBack","Called===============");
+        session.disconnect();
+    }
+
+    @SuppressLint("MissingInflatedId")
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
@@ -208,6 +275,8 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
 
         super.onCreate(savedInstanceState);
         setContentView(R.layout.video_call_layout);
+        new DownloadImageFromInternet((ImageView) findViewById(R.id.image_view)).execute("https://www.gravatar.com/avatar/?d=mp");
+
         getSupportActionBar().hide();
         ActionBar actionBar = getActionBar();
         if (actionBar != null) {
@@ -219,15 +288,15 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
             String TOKEN = intent.getStringExtra("token");
             String SESSION_ID = intent.getStringExtra("sessionId");
             String API_KEY = intent.getStringExtra("apiKey");
-            String SUBSCRIBERNAME = intent.getStringExtra("subscriberName");
-            String PUBLISHERNAME = intent.getStringExtra("publisherName");
+             SUBSCRIBERNAME = intent.getStringExtra("subscriberName");
+             PUBLISHERNAME = intent.getStringExtra("publisherName");
             ISPROVIDER = intent.getBooleanExtra("isProvider",false);
             publisherViewContainer = findViewById(R.id.publisher_container);
             subscriberViewContainer = findViewById(R.id.subscriber_container);
             TextView publisherNameTextView = findViewById(R.id.publisherName);
             TextView subscriberNameTextView = findViewById(R.id.subscriberName);
-            publisherNameTextView.setText(PUBLISHERNAME);
-            subscriberNameTextView.setText(SUBSCRIBERNAME);
+            publisherNameTextView.setText(SUBSCRIBERNAME);
+            subscriberNameTextView.setText(PUBLISHERNAME);
             timerTextView = findViewById(R.id.timerTextView);
         startTime = System.currentTimeMillis();
             isTimeron =true;
@@ -252,30 +321,34 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
             }
         });
 
-        imageViewMute.setOnClickListener(new View.OnClickListener() {
+        imageViewMute.setOnClickListener(new View.OnClickListener() {//mute and unmute audio
             @Override
             public void onClick(View v) {
 
-                if (!isMuted) {
-                    publisher.setPublishAudio(false);
-                    imageViewMute.setImageResource(R.drawable.microphoneoff);
-                } else {
-                    publisher.setPublishAudio(true);
-                    imageViewMute.setImageResource(R.drawable.microphoneonwhite);
+               if(publisher!=null) {
+                    if (!isMuted) {
+                        publisher.setPublishAudio(false);
+                        imageViewMute.setImageResource(R.drawable.microphoneoff);
+                    } else {
+                        publisher.setPublishAudio(true);
+                        imageViewMute.setImageResource(R.drawable.microphoneonwhite);
+                    }
+                    isMuted = !isMuted;
                 }
-                isMuted = !isMuted;
 
             }
         });
-        imageViewCamOff.setOnClickListener(new View.OnClickListener() {
+        imageViewCamOff.setOnClickListener(new View.OnClickListener() {//off & on camera
             @Override
             public void onClick(View v) {
+                if(publisher!=null) {
 
                 if (!isCamOff) {
                     publisher.setPublishVideo(false);
                     imageViewCamOff.setImageResource(R.drawable.cameraoff);
                     imageViewCamSwitch.setVisibility(View.GONE);
 
+
                 } else {
                     publisher.setPublishVideo(true);
                     imageViewCamOff.setImageResource(R.drawable.cameraonwhite);
@@ -285,14 +358,14 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
                 isCamOff = !isCamOff;
 
             }
+            }
         });
         imageViewCamSwitch.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                publisher.cycleCamera();
-
-
-
+                if(publisher!=null) {
+                    publisher.cycleCamera();//flip camera
+                }
             }
         });
 
@@ -316,6 +389,25 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
             session.onResume();
         }
     }
+    public void endCall() {
+        session.disconnect();
+
+        isEndall =true;
+//        killvc();
+
+    }
+//    public void killvc(){
+//        runOnUiThread(new Runnable() {
+//            @Override
+//            public void run() {
+//                Log.d("endVideoCall","PluginMethodendVideoCall");
+//                Log.d("endVideoCall",session.toString());
+//
+//            }
+//        });
+//
+//
+//    }
     private void startTimer() {
 //        startTime = System.currentTimeMillis();
         Handler handler = new Handler();
@@ -390,10 +482,10 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
 
 
     private void initializeSession(String apiKey, String sessionId, String token) {
+        Log.i(TAG, "initializeSession: " + "initializeSession");
         Log.i(TAG, "apiKey: " + apiKey);
         Log.i(TAG, "sessionId: " + sessionId);
         Log.i(TAG, "token: " + token);
-
         /*
         The context used depends on the specific use case, but usually, it is desired for the session to
         live outside of the Activity e.g: live between activities. For a production applications,
@@ -402,6 +494,8 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
         session = new Session.Builder(this, apiKey, sessionId).build();
         session.setSessionListener(sessionListener);
         session.connect(token);
+        Log.d("initializeSession","session.toString()");
+        Log.d("initializeSession",session.toString());
     }
 
 //    private void initRetrofit() {
@@ -421,14 +515,39 @@ public class VideoCallActivity extends AppCompatActivity implements EasyPermissi
 ////        apiService = retrofit.create(APIService.class);
 //    }
 
+    private void showToast(String message) {
+        Toast.makeText(this, message, Toast.LENGTH_LONG).show();
+    }
     private void finishWithMessage(String message) {
         Log.e(TAG, message);
-        Toast.makeText(this, message, Toast.LENGTH_LONG).show();
+//        Toast.makeText(this, message, Toast.LENGTH_LONG).show();
         session.disconnect();
         Intent resultIntent = new Intent();
         String resultcode = ISPROVIDER?"999":"888";
-        resultIntent.putExtra("result_key", resultcode); // Optional: Pass data back to the calling activity
+        resultIntent.putExtra("result_key", resultcode);
         setResult(RESULT_OK, resultIntent);
         this.finish();
     }
+    private class DownloadImageFromInternet extends AsyncTask<String, Void, Bitmap> {
+        ImageView imageView;
+        public DownloadImageFromInternet(ImageView imageView) {
+            this.imageView=imageView;
+            Toast.makeText(getApplicationContext(), "Please wait, it may take a few minute...",Toast.LENGTH_SHORT).show();
+        }
+        protected Bitmap doInBackground(String... urls) {
+            String imageURL=urls[0];
+            Bitmap bimage=null;
+            try {
+                InputStream in=new java.net.URL(imageURL).openStream();
+                bimage= BitmapFactory.decodeStream(in);
+            } catch (Exception e) {
+                Log.e("Error Message", e.getMessage());
+                e.printStackTrace();
+            }
+            return bimage;
+        }
+        protected void onPostExecute(Bitmap result) {
+            imageView.setImageBitmap(result);
+        }
+    }
 }

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

@@ -9,6 +9,7 @@ import com.opentok.android.Subscriber;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Handler;
+import android.os.Looper;
 import android.util.Log;
 
 import com.getcapacitor.JSObject;
@@ -20,10 +21,33 @@ import com.getcapacitor.annotation.CapacitorPlugin;
 
 @CapacitorPlugin(name = "vonage",requestCodes = {999})
 public class vonagePlugin extends Plugin {
-
+    String Tag = "VONAGETAG";
+    Boolean isProvid=false;
     private Session session;
 
     private String TAG = "Capacitor_Vonage_plugin";
+
+    @PluginMethod()
+    public void endVideoCall(PluginCall call) {
+        showLog("endVideoCallPluginMethod");
+
+
+
+        Handler mainHandler = new Handler(Looper.getMainLooper());
+        Runnable myRunnable = new Runnable() {
+            @Override
+            public void run() {
+                try{
+//                    VideoCallActivity videoCallActivity = new VideoCallActivity();
+//                    videoCallActivity.;
+                }catch (Exception e){
+                    showLog(e.toString());
+                }
+            }
+        };
+        mainHandler.post(myRunnable);
+
+    }
     @PluginMethod()
     public void openVideoCallWindow(PluginCall call) {
 
@@ -35,6 +59,7 @@ public class vonagePlugin extends Plugin {
         final String PUBLISHERNAME =  call.getString("publisherName");
         final String SUBSCRIBERNAME =  call.getString("subscriberName");
         final Boolean ISPROVIDER =  call.getBoolean("isProvider");
+        isProvid = ISPROVIDER;
 //        initializeSession(API_KEY, SESSION_ID, TOKEN);
         Intent intent = new Intent(getContext(),    VideoCallActivity.class);
         intent.putExtra("apiKey",API_KEY);
@@ -42,20 +67,19 @@ public class vonagePlugin extends Plugin {
         intent.putExtra("token",TOKEN);
         intent.putExtra("subscriberName",SUBSCRIBERNAME);
         intent.putExtra("publisherName",PUBLISHERNAME);
-        intent.putExtra("publisherName",PUBLISHERNAME);
         intent.putExtra("isProvider",ISPROVIDER);
 //        intent.putExtra("callbackIdentifier", );
 //        notifyListeners("onDataReceived", );
 //        StartedCall();
         Handler handler = new Handler();
-        int delayMillis = 5000;
+        int delayMillis = 2000;
 
         handler.postDelayed(new Runnable() {
             @Override
             public void run() {
-
                 eventData.put("isProvider", ISPROVIDER);
                 notifyListeners("VideoCallStarted",eventData);
+                Log.d("VIDEOCALL","isProvider634");
             }
         }, delayMillis);
         startActivityForResult(call,intent,999);
@@ -73,16 +97,25 @@ public class vonagePlugin extends Plugin {
         Log.d(TAG, String.valueOf(resultCode));
         Log.d(TAG, String.valueOf(requestCode));
         Log.d(TAG, String.valueOf(data));
-        String result = data.getStringExtra("result_key");
-        if(result == "999"){
-            eventData.put("isProvider", true);
-            notifyListeners("VideoCallEnded",eventData);
-
-
-        }else{
-            eventData.put("isProvider", false);
-            Log.d(TAG,"CODE 98 -----------" );
-            notifyListeners("VideoCallEnded",eventData);
+        String result = "";
+        try{
+            result = data.getStringExtra("result_key");
+            showLog("result");
+            showLog(result);
+        }catch(Exception e){
+            showLog("ewererewrwerwe");
+            showLog(e.toString());
+        }
+        VideoCallActivity videoCallActivity = new VideoCallActivity();
+        if(!videoCallActivity.isEndall){
+            if (isProvid) {
+                eventData.put("isProvider", true);
+                notifyListeners("VideoCallEnded", eventData);
+            } else {
+                eventData.put("isProvider", false);
+                Log.d(TAG, "CODE 98 -----------");
+                notifyListeners("VideoCallEnded", eventData);
+            }
         }
     }
 
@@ -122,4 +155,7 @@ public class vonagePlugin extends Plugin {
 //        session.setSessionListener(sessionListener);
 //        session.connect(token);
 //    }
+    private void showLog(String log){
+        Log.d(Tag,log);
+    }
 }

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

@@ -30,21 +30,32 @@
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
+<!--                android:background="#FF5733"-->
 
                 <FrameLayout
                     android:id="@+id/subscriber_container"
                     android:layout_width="fill_parent"
-                    android:layout_height="match_parent" />
+                    android:layout_height="match_parent"
+                    android:background="#9b9c98" >
+
+                    <ImageView
+                        android:id="@+id/image_view"
+                        android:layout_width="150dp"
+                        android:layout_height="150dp"
+                        android:scaleType="centerCrop" />
+                </FrameLayout>
 
                 <TextView
-                    android:id="@+id/subscriberName"
-                    android:layout_width="140dp"
-                    android:layout_height="157dp"
+                    android:id="@+id/publisherName"
+                    android:layout_width="150dp"
+                    android:layout_height="wrap_content"
+
                     android:layout_gravity="bottom|start"
                     android:paddingLeft="10dp"
                     android:paddingBottom="120dp"
+
                     android:text="Publisher Name"
-                    android:textColor="@android:color/background_dark"
+                    android:textColor="@android:color/white"
                     android:textSize="16sp"
                     android:visibility="visible" />
                 <TextView
@@ -56,7 +67,7 @@
                     android:paddingLeft="10dp"
                     android:text="00:00:00"
                     android:visibility="visible"
-                    android:textColor="@android:color/background_dark"
+                    android:textColor="@android:color/white"
                     android:textSize="16sp" />
 
                 <FrameLayout
@@ -67,19 +78,39 @@
                     android:layout_marginEnd="16dp"
                     android:layout_marginRight="16dp"
                     android:layout_marginBottom="80dp"
-                    android:background="#FFFFFF"
+                    android:background="#9b9c98"
+                    android:layout_below="@id/subscriberName"
+
                     android:padding="2dp" >
-                    <TextView
-                        android:id="@+id/publisherName"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="bottom|start"
-                        android:textSize="12sp"
-                        android:text="Subscriber Name"
-                        android:paddingBottom="5dp"
-                        android:visibility="visible"
-                        android:textColor="@android:color/background_dark" />
+
                 </FrameLayout>
+                <TextView
+                    android:id="@+id/subscriberName"
+                    android:layout_width="100dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom|end"
+                    android:textSize="12sp"
+                    android:text="Subscriber Name"
+                    android:paddingBottom="25dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginBottom="80dp"
+                    android:textColor="@android:color/white" />
+                <androidx.cardview.widget.CardView
+                    android:layout_width="155dp"
+                    android:layout_height="155dp"
+                    app:cardCornerRadius="250dp"
+                    app:cardBackgroundColor="@android:color/white">
+
+                    <androidx.cardview.widget.CardView
+                        android:layout_width="150dp"
+                        android:layout_height="150dp"
+                        app:cardCornerRadius="250dp"
+                        android:layout_gravity="center">
+
+                    </androidx.cardview.widget.CardView>
+
+                </androidx.cardview.widget.CardView>
+
 
             </FrameLayout>
 
@@ -92,7 +123,7 @@
 
         <LinearLayout
             android:layout_width="fill_parent"
-            android:layout_height="49dp"
+            android:layout_height="53dp"
             android:layout_alignParentBottom="false"
             android:gravity="clip_horizontal"
             android:orientation="horizontal"

package/dist/docs.json

@@ -39,6 +39,16 @@
         ],
         "slug": "openvideocallwindow"
       },
+      {
+        "name": "endVideoCall",
+        "signature": "() => Promise<{ value: string; }>",
+        "parameters": [],
+        "returns": "Promise<{ value: string; }>",
+        "tags": [],
+        "docs": "",
+        "complexTypes": [],
+        "slug": "endvideocall"
+      },
       {
         "name": "addListener",
         "signature": "(...args: [eventName: \"VideoCallEnded\", listenerFunc: (info: any) => void] | [eventName: \"VideoCallStarted\", listenerFunc: (info: any) => void]) => Promise<PluginListenerHandle> & PluginListenerHandle",

package/dist/esm/definitions.d.ts

@@ -8,5 +8,8 @@ export interface vonagePlugin {
     openVideoCallWindow(options: Object): Promise<{
         value: any;
     }>;
+    endVideoCall(): Promise<{
+        value: string;
+    }>;
     addListener(...args: [eventName: 'VideoCallEnded', listenerFunc: (info: any) => void] | [eventName: 'VideoCallStarted', listenerFunc: (info: any) => void]): Promise<PluginListenerHandle> & PluginListenerHandle;
 }

package/dist/esm/definitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["import { PluginListenerHandle } from \"@capacitor/core\";\n\nexport interface vonagePlugin {\n  echo(options: { value: string }): Promise<{ value: string }>;\n  openVideoCallWindow(options: Object): Promise<{ value: any }>;\n  addListener(...args: [eventName: 'VideoCallEnded', listenerFunc: (info: any) => void] | [eventName: 'VideoCallStarted', listenerFunc: (info: any) => void]): Promise<PluginListenerHandle> & PluginListenerHandle;\n\n}\n"]}
+{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["import { PluginListenerHandle } from \"@capacitor/core\";\n\nexport interface vonagePlugin {\n  echo(options: { value: string }): Promise<{ value: string }>;\n  openVideoCallWindow(options: Object): Promise<{ value: any }>;\n  endVideoCall(): Promise<{ value: string }>;\n  addListener(...args: [eventName: 'VideoCallEnded', listenerFunc: (info: any) => void] | [eventName: 'VideoCallStarted', listenerFunc: (info: any) => void]): Promise<PluginListenerHandle> & PluginListenerHandle;\n\n}\n"]}

package/dist/esm/web.d.ts

@@ -1,6 +1,9 @@
 import { WebPlugin } from '@capacitor/core';
 import type { vonagePlugin } from './definitions';
 export declare class vonageWeb extends WebPlugin implements vonagePlugin {
+    endVideoCall(): Promise<{
+        value: string;
+    }>;
     echo(options: {
         value: string;
     }): Promise<{

package/dist/esm/web.js

@@ -1,5 +1,9 @@
 import { WebPlugin } from '@capacitor/core';
 export class vonageWeb extends WebPlugin {
+    endVideoCall() {
+        let dummyValue;
+        return dummyValue;
+    }
     async echo(options) {
         console.log('ECHO', options);
         return options;

package/dist/esm/web.js.map

@@ -1 +1 @@
-{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAI5C,MAAM,OAAO,SAAU,SAAQ,SAAS;IACtC,KAAK,CAAC,IAAI,CAAC,OAA0B;QACnC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC7B,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,KAAK,CAAC,mBAAmB,CAAC,OAAe;QACvC,IAAI,UAAc,CAAC;QACnB,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC;QAC5C,OAAO,UAAU,CAAC;IACpB,CAAC;CACF","sourcesContent":["import { WebPlugin } from '@capacitor/core';\n\nimport type { vonagePlugin } from './definitions';\n\nexport class vonageWeb extends WebPlugin implements vonagePlugin {\n  async echo(options: { value: string }): Promise<{ value: string }> {\n    console.log('ECHO', options);\n    return options;\n  }\n  async openVideoCallWindow(options: Object): Promise<{ value: any }>{\n    let dummyValue:any;\n    console.log('openVideoCallWindow', options);\n    return dummyValue;\n  }\n}\n"]}
+{"version":3,"file":"web.js","sourceRoot":"","sources":["../../src/web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAI5C,MAAM,OAAO,SAAU,SAAQ,SAAS;IACtC,YAAY;QACV,IAAI,UAAc,CAAC;QACnB,OAAO,UAAU,CAAC;IACpB,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,OAA0B;QACnC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC7B,OAAO,OAAO,CAAC;IACjB,CAAC;IACD,KAAK,CAAC,mBAAmB,CAAC,OAAe;QACvC,IAAI,UAAc,CAAC;QACnB,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC;QAC5C,OAAO,UAAU,CAAC;IACpB,CAAC;CACF","sourcesContent":["import { WebPlugin } from '@capacitor/core';\n\nimport type { vonagePlugin } from './definitions';\n\nexport class vonageWeb extends WebPlugin implements vonagePlugin {\n  endVideoCall(): Promise<{ value: string; }> {\n    let dummyValue:any;\n    return dummyValue;\n  }\n  async echo(options: { value: string }): Promise<{ value: string }> {\n    console.log('ECHO', options);\n    return options;\n  }\n  async openVideoCallWindow(options: Object): Promise<{ value: any }>{\n    let dummyValue:any;\n    console.log('openVideoCallWindow', options);\n    return dummyValue;\n  }\n}\n"]}

package/dist/plugin.cjs.js

@@ -9,6 +9,10 @@ const vonage = core.registerPlugin('vonage', {
 });
 
 class vonageWeb extends core.WebPlugin {
+    endVideoCall() {
+        let dummyValue;
+        return dummyValue;
+    }
     async echo(options) {
         console.log('ECHO', options);
         return options;

package/dist/plugin.cjs.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.cjs.js","sources":["esm/index.js","esm/web.js"],"sourcesContent":["import { registerPlugin } from '@capacitor/core';\nconst vonage = registerPlugin('vonage', {\n    web: () => import('./web').then(m => new m.vonageWeb()),\n});\nexport * from './definitions';\nexport { vonage };\n//# sourceMappingURL=index.js.map","import { WebPlugin } from '@capacitor/core';\nexport class vonageWeb extends WebPlugin {\n    async echo(options) {\n        console.log('ECHO', options);\n        return options;\n    }\n    async openVideoCallWindow(options) {\n        let dummyValue;\n        console.log('openVideoCallWindow', options);\n        return dummyValue;\n    }\n}\n//# sourceMappingURL=web.js.map"],"names":["registerPlugin","WebPlugin"],"mappings":";;;;;;AACK,MAAC,MAAM,GAAGA,mBAAc,CAAC,QAAQ,EAAE;AACxC,IAAI,GAAG,EAAE,MAAM,mDAAe,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;AAC3D,CAAC;;ACFM,MAAM,SAAS,SAASC,cAAS,CAAC;AACzC,IAAI,MAAM,IAAI,CAAC,OAAO,EAAE;AACxB,QAAQ,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AACrC,QAAQ,OAAO,OAAO,CAAC;AACvB,KAAK;AACL,IAAI,MAAM,mBAAmB,CAAC,OAAO,EAAE;AACvC,QAAQ,IAAI,UAAU,CAAC;AACvB,QAAQ,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC;AACpD,QAAQ,OAAO,UAAU,CAAC;AAC1B,KAAK;AACL;;;;;;;;;"}
+{"version":3,"file":"plugin.cjs.js","sources":["esm/index.js","esm/web.js"],"sourcesContent":["import { registerPlugin } from '@capacitor/core';\nconst vonage = registerPlugin('vonage', {\n    web: () => import('./web').then(m => new m.vonageWeb()),\n});\nexport * from './definitions';\nexport { vonage };\n//# sourceMappingURL=index.js.map","import { WebPlugin } from '@capacitor/core';\nexport class vonageWeb extends WebPlugin {\n    endVideoCall() {\n        let dummyValue;\n        return dummyValue;\n    }\n    async echo(options) {\n        console.log('ECHO', options);\n        return options;\n    }\n    async openVideoCallWindow(options) {\n        let dummyValue;\n        console.log('openVideoCallWindow', options);\n        return dummyValue;\n    }\n}\n//# sourceMappingURL=web.js.map"],"names":["registerPlugin","WebPlugin"],"mappings":";;;;;;AACK,MAAC,MAAM,GAAGA,mBAAc,CAAC,QAAQ,EAAE;AACxC,IAAI,GAAG,EAAE,MAAM,mDAAe,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;AAC3D,CAAC;;ACFM,MAAM,SAAS,SAASC,cAAS,CAAC;AACzC,IAAI,YAAY,GAAG;AACnB,QAAQ,IAAI,UAAU,CAAC;AACvB,QAAQ,OAAO,UAAU,CAAC;AAC1B,KAAK;AACL,IAAI,MAAM,IAAI,CAAC,OAAO,EAAE;AACxB,QAAQ,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;AACrC,QAAQ,OAAO,OAAO,CAAC;AACvB,KAAK;AACL,IAAI,MAAM,mBAAmB,CAAC,OAAO,EAAE;AACvC,QAAQ,IAAI,UAAU,CAAC;AACvB,QAAQ,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC;AACpD,QAAQ,OAAO,UAAU,CAAC;AAC1B,KAAK;AACL;;;;;;;;;"}

package/dist/plugin.js

@@ -6,6 +6,10 @@ var capacitorvonage = (function (exports, core) {
     });
 
     class vonageWeb extends core.WebPlugin {
+        endVideoCall() {
+            let dummyValue;
+            return dummyValue;
+        }
         async echo(options) {
             console.log('ECHO', options);
             return options;

package/dist/plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.js","sources":["esm/index.js","esm/web.js"],"sourcesContent":["import { registerPlugin } from '@capacitor/core';\nconst vonage = registerPlugin('vonage', {\n    web: () => import('./web').then(m => new m.vonageWeb()),\n});\nexport * from './definitions';\nexport { vonage };\n//# sourceMappingURL=index.js.map","import { WebPlugin } from '@capacitor/core';\nexport class vonageWeb extends WebPlugin {\n    async echo(options) {\n        console.log('ECHO', options);\n        return options;\n    }\n    async openVideoCallWindow(options) {\n        let dummyValue;\n        console.log('openVideoCallWindow', options);\n        return dummyValue;\n    }\n}\n//# sourceMappingURL=web.js.map"],"names":["registerPlugin","WebPlugin"],"mappings":";;;AACK,UAAC,MAAM,GAAGA,mBAAc,CAAC,QAAQ,EAAE;IACxC,IAAI,GAAG,EAAE,MAAM,mDAAe,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;IAC3D,CAAC;;ICFM,MAAM,SAAS,SAASC,cAAS,CAAC;IACzC,IAAI,MAAM,IAAI,CAAC,OAAO,EAAE;IACxB,QAAQ,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,QAAQ,OAAO,OAAO,CAAC;IACvB,KAAK;IACL,IAAI,MAAM,mBAAmB,CAAC,OAAO,EAAE;IACvC,QAAQ,IAAI,UAAU,CAAC;IACvB,QAAQ,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC;IACpD,QAAQ,OAAO,UAAU,CAAC;IAC1B,KAAK;IACL;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"plugin.js","sources":["esm/index.js","esm/web.js"],"sourcesContent":["import { registerPlugin } from '@capacitor/core';\nconst vonage = registerPlugin('vonage', {\n    web: () => import('./web').then(m => new m.vonageWeb()),\n});\nexport * from './definitions';\nexport { vonage };\n//# sourceMappingURL=index.js.map","import { WebPlugin } from '@capacitor/core';\nexport class vonageWeb extends WebPlugin {\n    endVideoCall() {\n        let dummyValue;\n        return dummyValue;\n    }\n    async echo(options) {\n        console.log('ECHO', options);\n        return options;\n    }\n    async openVideoCallWindow(options) {\n        let dummyValue;\n        console.log('openVideoCallWindow', options);\n        return dummyValue;\n    }\n}\n//# sourceMappingURL=web.js.map"],"names":["registerPlugin","WebPlugin"],"mappings":";;;AACK,UAAC,MAAM,GAAGA,mBAAc,CAAC,QAAQ,EAAE;IACxC,IAAI,GAAG,EAAE,MAAM,mDAAe,CAAC,IAAI,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;IAC3D,CAAC;;ICFM,MAAM,SAAS,SAASC,cAAS,CAAC;IACzC,IAAI,YAAY,GAAG;IACnB,QAAQ,IAAI,UAAU,CAAC;IACvB,QAAQ,OAAO,UAAU,CAAC;IAC1B,KAAK;IACL,IAAI,MAAM,IAAI,CAAC,OAAO,EAAE;IACxB,QAAQ,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,QAAQ,OAAO,OAAO,CAAC;IACvB,KAAK;IACL,IAAI,MAAM,mBAAmB,CAAC,OAAO,EAAE;IACvC,QAAQ,IAAI,UAAU,CAAC;IACvB,QAAQ,OAAO,CAAC,GAAG,CAAC,qBAAqB,EAAE,OAAO,CAAC,CAAC;IACpD,QAAQ,OAAO,UAAU,CAAC;IAC1B,KAAK;IACL;;;;;;;;;;;;;;;;;"}

package/ios/Plugin/VideoChatViewController.swift

@@ -9,6 +9,7 @@ import UIKit
 import OpenTok
 
 class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDelegate,OTSubscriberDelegate  {
+    var isCallEnded = false
     var kApiKey = ""
     var kSessionId = ""
     var kToken = ""
@@ -41,6 +42,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     var counter = 0
     var timer = Timer()
     override func viewDidLoad() {
+        
         super.viewDidLoad()
         self.navigationController?.navigationBar.isHidden = true
         self.viewSetupMethod()
@@ -85,10 +87,26 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     }
     override func viewDidAppear(_ animated: Bool) {
         super.viewDidAppear(animated)
+        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()
+    }
+    override func viewDidDisappear(_ animated: Bool) {
+        super.viewDidDisappear(animated)
+        NotificationCenter.default.removeObserver(self, name:  NSNotification.Name("EndVideoCall"), object: nil)
+    }
+    @objc func endVideoCall(_ notification: Notification){
+        print("end video call called")
+        endVonageCall()
+        NotificationCenter.default.removeObserver(self, name:  NSNotification.Name("EndVideoCall"), object: nil)
     }
     func startTimer(){
         timer.invalidate()
@@ -208,6 +226,13 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         audioBtn.addTarget(self, action:#selector(self.audioBtnbuttonClicked), for: .touchUpInside)
         bottomView.addSubview(audioBtn)
         
+    }
+     deinit{
+        if(!isCallEnded){
+            let userInfo = ["userInfo": ["isProvider": self.isProvider]]
+            NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
+        }
+        
     }
     
     @objc func callBtnbuttonClicked() {
@@ -233,6 +258,9 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     }
     
     @objc func videoBtnbuttonClicked() {
+        turnOnAndOffVideo()
+    }
+    func turnOnAndOffVideo(){
         if (self.isVideoMute) {
             self.publisher?.publishVideo = true
             self.videoBtn.setImage(UIImage(named : "cameraOnWhite"), for: .normal)
@@ -275,6 +303,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         let settings = OTPublisherSettings()
         settings.name = publisherName
         guard let publisher = OTPublisher(delegate: self, settings: settings) else {
+            print("publisher create error")
             return
         }
         self.publisher = publisher
@@ -286,6 +315,7 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         }
         
         guard let publisherView = publisher.view else {
+            print("publisher view not created")
             return
         }
         
@@ -300,6 +330,10 @@ 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)
     }
     
@@ -326,6 +360,9 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
         }
         
         subscriberView.frame = UIScreen.main.bounds
+        if(stream.videoType == .screen){
+            subscriberView.accessibilityValue = "from screen"
+        }
         remoteView.addSubview(subscriberView)
     }
     
@@ -337,16 +374,26 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
 //            self.session?.disconnect(nil)
 //            self.dismiss(animated: true, completion: nil)
 //        }
-        if let subStream = subscriber?.stream, subStream.streamId == stream.streamId,!isProvider {
+        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)
             self.session?.disconnect(nil)
             self.dismiss(animated: true, completion: nil)
                }
-        subscriberImg.isHidden = false
-        showToast(message: "\(subscriberName) is left the call")
-        cleanupSubscriber()
+        if(stream.videoType != .screen){
+            subscriberImg.isHidden = false
+            showToast(message: "\(subscriberName) is left the call")
+            cleanupSubscriber()
+        }
+        if(stream.videoType == .screen){
+            for subview in remoteView.subviews{
+                if(subview.accessibilityValue == "from screen"){
+                    subview.removeFromSuperview()
+                }
+            }
+        }
+        
         
     }
     
@@ -368,7 +415,10 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     public func subscriberDidConnect(toStream subscriber: OTSubscriberKit) {
         print("The subscriber did connect to the stream.")
         subscriberImg.isHidden = true
-        showToast(message: "\(subscriberName) is joined the call")
+        if(subscriber.stream?.videoType != .screen){
+            showToast(message: "\(subscriberName) is joined the call")
+        }
+        
     }
     
     public func subscriber(_ subscriber: OTSubscriberKit, didFailWithError error: OTError) {
@@ -391,14 +441,21 @@ class VideoChatViewController: UIViewController,OTSessionDelegate,OTPublisherDel
     }
     
     @IBAction func endCallAction(_ sender: Any) {
-        //var error: OTError?
-        let userInfo = ["userInfo": ["isProvider": isProvider]]
+        isCallEnded = true
+        let userInfo = ["userInfo": ["isProvider": self.isProvider]]
         NotificationCenter.default.post(name: NSNotification.Name(NotificationNames.videoEnded),object: nil,userInfo: userInfo)
-        cleanupSubscriber()
-        cleanupPublisher()
-        self.session?.disconnect(nil)
-        self.stopTimer()
-       // self.dismiss(animated: true, completion: nil)
+        endVonageCall()
+    }
+    fileprivate func endVonageCall(){
+        isCallEnded = true
+        DispatchQueue.main.async {
+            
+            self.cleanupSubscriber()
+            self.cleanupPublisher()
+            self.session?.disconnect(nil)
+            self.stopTimer()
+            // self.dismiss(animated: true, completion: nil)
+        }
     }
     fileprivate func cleanupSubscriber() {
            subscriber?.view?.removeFromSuperview()

package/ios/Plugin/vonagePlugin.m

@@ -6,4 +6,5 @@
 CAP_PLUGIN(vonagePlugin, "vonage",
            CAP_PLUGIN_METHOD(echo, CAPPluginReturnPromise);
            CAP_PLUGIN_METHOD(openVideoCallWindow, CAPPluginReturnPromise);
+           CAP_PLUGIN_METHOD(endVideoCall, CAPPluginReturnPromise);
 )

package/ios/Plugin/vonagePlugin.swift

@@ -46,6 +46,10 @@ public class vonagePlugin: CAPPlugin {
         
         call.resolve(["value": "Video call initiated"])
     }
+    @objc func endVideoCall(_ call: CAPPluginCall) {
+        NotificationCenter.default.post(name: NSNotification.Name("EndVideoCall"),object: nil,userInfo: nil)
+        call.resolve(["value": "Video call ended."])
+    }
     @objc func videoEnded(_ notification: Notification){
         self.notifyListeners(NotificationNames.videoEnded, data: notification.userInfo?["userInfo"] as? [String: Any] ?? [:])
         NotificationCenter.default.removeObserver(self, name:  NSNotification.Name(NotificationNames.videoEnded), object: nil)

package/package.json

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