Changeset 5649 for pjproject/trunk/pjsip-apps/src/swig/java/android/app

Timestamp:

Sep 15, 2017 5:32:08 AM (7 years ago)

Author:

riza

Message:

Re #2041: Implement API to handle IP address change.

Location:

pjproject/trunk/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/pjsua2/app

Files:

• MainActivity.java (modified) (8 diffs)
• MyApp.java (modified) (2 diffs)

pjproject/trunk/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/pjsua2/app/MainActivity.java

@@ -19 +19 @@
 package org.pjsip.pjsua2.app;
 
+import android.content.IntentFilter;
 import android.os.Bundle;
 import android.os.Handler;
@@ -27 +28 @@
 import android.content.Intent;
 import android.content.pm.ApplicationInfo;
+import android.content.BroadcastReceiver;
+import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -37 +40 @@
 import android.widget.SimpleAdapter;
 import android.widget.TextView;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
 
 import java.util.ArrayList;
@@ -51 +56 @@
     public static MyAccount account = null;
     public static AccountConfig accCfg = null;
+    public static MyBroadcastReceiver receiver = null;
+    public static IntentFilter intentFilter = null;
 
     private ListView buddyListView;
@@ -66 +73 @@
         public final static int BUDDY_STATE = 4;
         public final static int CALL_MEDIA_STATE = 5;
+        public final static int CHANGE_NETWORK = 6;
+    }
+
+    private class MyBroadcastReceiver extends BroadcastReceiver {
+        private String conn_name = "";
+
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            if (isNetworkChange(context))
+                notifyChangeNetwork();
+        }
+
+        private boolean isNetworkChange(Context context) {
+            boolean network_changed = false;
+            ConnectivityManager connectivity_mgr =
+                ((ConnectivityManager)context.getSystemService(
+                                                 Context.CONNECTIVITY_SERVICE));
+
+            NetworkInfo net_info = connectivity_mgr.getActiveNetworkInfo();
+            if(net_info != null && net_info.isConnectedOrConnecting() &&
+               !conn_name.equalsIgnoreCase(""))
+            {
+                String new_con = net_info.getExtraInfo();
+                if (new_con != null && !new_con.equalsIgnoreCase(conn_name))
+                    network_changed = true;
+
+                conn_name = (new_con == null)?"":new_con;
+            } else {
+                if (conn_name.equalsIgnoreCase(""))
+                    conn_name = net_info.getExtraInfo();
+            }
+            return network_changed;
+        }
     }
 
@@ -144 +184 @@
             }
         );
-
+        if (receiver == null) {
+            receiver = new MyBroadcastReceiver();
+            intentFilter = new IntentFilter(
+                                       ConnectivityManager.CONNECTIVITY_ACTION);
+            registerReceiver(receiver, intentFilter);
+        }
     }
 
@@ -264 +309 @@
             showCallActivity();
 
+        } else if (m.what == MSG_TYPE.CHANGE_NETWORK) {
+            app.handleNetworkChange();
         } else {
 
@@ -577 +624 @@
     }
 
+    public void notifyChangeNetwork()
+    {
+        Message m = Message.obtain(handler, MSG_TYPE.CHANGE_NETWORK, null);
+        m.sendToTarget();
+    }
+
     /* === end of MyAppObserver ==== */
 

pjproject/trunk/pjsip-apps/src/swig/java/android/app/src/main/java/org/pjsip/pjsua2/app/MyApp.java

@@ -34 +34 @@
     abstract void notifyCallMediaState(MyCall call);
     abstract void notifyBuddyState(MyBuddy buddy);
+    abstract void notifyChangeNetwork();
 }
 
@@ -535 +536 @@
     }
 
+    public void handleNetworkChange()
+    {
+        try{
+            System.out.println("Network change detected");
+            IpChangeParam changeParam = new IpChangeParam();
+            ep.handleIpChange(changeParam);
+        } catch (Exception e) {
+            System.out.println(e);
+        }
+    }
+
     public void deinit()
     {