Changeset 4693 for pjproject

Timestamp:

Dec 14, 2013 1:14:07 AM (11 years ago)

Author:

nanang

Message:

Re #1716: Handle recreated activity, for example by device rotation.

Location:

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/java/android

Files:

• res/layout/activity_call.xml (modified) (1 diff)
• src/org/pjsip/pjsua2/app/CallActivity.java (modified) (5 diffs)
• src/org/pjsip/pjsua2/app/MainActivity.java (modified) (3 diffs)

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/java/android/res/layout/activity_call.xml

@@ -4 +4 @@
     android:layout_height="match_parent"
     android:gravity="center"
+    android:paddingBottom="@dimen/activity_vertical_margin"
+    android:paddingLeft="@dimen/activity_horizontal_margin"
+    android:paddingRight="@dimen/activity_horizontal_margin"
+    android:paddingTop="@dimen/activity_vertical_margin"
     android:orientation="vertical" >
 

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/CallActivity.java

@@ -24 +24 @@
 import android.view.View;
 import android.widget.Button;
-import android.widget.EditText;
 import android.widget.TextView;
 import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface;
 
 import org.pjsip.pjsua2.*;
@@ -34 +31 @@
 public class CallActivity extends Activity implements Handler.Callback {
         
-        public final Handler handler = new Handler(this);
         public static Handler handler_;
+
+        private final Handler handler = new Handler(this);
+        private static CallInfo lastCallInfo;
 
         @Override
@@ -43 +42 @@
                 
                 handler_ = handler;
-                MyCall call = MainActivity.currentCall;
-                
-                final TextView tvPeer  = (TextView) findViewById(R.id.textViewPeer);
-                final TextView tvState = (TextView) findViewById(R.id.textViewCallState);
-                final Button buttonAccept = (Button) findViewById(R.id.buttonAccept);
-                final Button buttonHangup = (Button) findViewById(R.id.buttonHangup);
-
-                String remote_uri = "Somebody";
-                String call_state = "";
-                try {
-                        CallInfo ci = call.getInfo();
-                        remote_uri = ci.getRemoteUri();
-                        if (ci.getRole() == pjsip_role_e.PJSIP_ROLE_UAS) {
-                                call_state = "Incoming call..";
-                        } else {
-                                buttonAccept.setVisibility(View.GONE);
-                                buttonHangup.setText("Cancel");
-                                call_state = ci.getStateText();
+                if (MainActivity.currentCall != null) {
+                        try {
+                                lastCallInfo = MainActivity.currentCall.getInfo();
+                                updateCallState(lastCallInfo);
+                        } catch (Exception e) {
+                                System.out.println(e);
                         }
-                } catch (Exception e) {
-                        System.out.println(e);
+                } else {
+                        updateCallState(lastCallInfo);
                 }
-                
-                tvPeer.setText(remote_uri);
-                tvState.setText(call_state);            
         }
 
@@ -110 +94 @@
                 if (m.what == MainActivity.MSG_TYPE.CALL_STATE) {
                         
-                        TextView tvState = (TextView) findViewById(R.id.textViewCallState);
-                        Button buttonHangup = (Button) findViewById(R.id.buttonHangup);
-                        Button buttonAccept = (Button) findViewById(R.id.buttonAccept);
-                        
-                        CallInfo ci = (CallInfo) m.obj;
-                        String call_state = "";
-                        if (ci.getRole() == pjsip_role_e.PJSIP_ROLE_UAC ||
-                                ci.getState().swigValue() >= pjsip_inv_state.PJSIP_INV_STATE_CONFIRMED.swigValue())
-                        {
-                                call_state = ci.getStateText();
-                                tvState.setText(call_state);
-                        }
-                        
-                        if (ci.getState() == pjsip_inv_state.PJSIP_INV_STATE_CONFIRMED) {
-                                buttonHangup.setText("Hangup");
-                        }
-                        
-                        if (ci.getState() == pjsip_inv_state.PJSIP_INV_STATE_DISCONNECTED) {
-                                buttonHangup.setText("OK");
-                                buttonAccept.setVisibility(View.GONE);
-                                tvState.setText("Call disconnected: " + ci.getLastReason());
-                                MainActivity.currentCall = null;
-                        }
+                        lastCallInfo = (CallInfo) m.obj;
+                        updateCallState(lastCallInfo);
                         
                 } else {
@@ -144 +107 @@
         }
         
-        
+        private void updateCallState(CallInfo ci) {
+                TextView tvPeer  = (TextView) findViewById(R.id.textViewPeer);
+                TextView tvState = (TextView) findViewById(R.id.textViewCallState);
+                Button buttonHangup = (Button) findViewById(R.id.buttonHangup);
+                Button buttonAccept = (Button) findViewById(R.id.buttonAccept);
+                String call_state = "";
+                
+                if (ci.getRole() == pjsip_role_e.PJSIP_ROLE_UAC) {
+                        buttonAccept.setVisibility(View.GONE);
+                }
+                                
+                if (ci.getState().swigValue() < pjsip_inv_state.PJSIP_INV_STATE_CONFIRMED.swigValue())
+                {
+                        if (ci.getRole() == pjsip_role_e.PJSIP_ROLE_UAS) {
+                                call_state = "Incoming call..";
+                                /* Default button texts are already 'Accept' & 'Reject' */
+                        } else {
+                                buttonHangup.setText("Cancel");
+                                call_state = ci.getStateText();
+                        }
+                }
+                else if (ci.getState().swigValue() >= pjsip_inv_state.PJSIP_INV_STATE_CONFIRMED.swigValue())
+                {
+                        buttonAccept.setVisibility(View.GONE);
+                        call_state = ci.getStateText();
+                        if (ci.getState() == pjsip_inv_state.PJSIP_INV_STATE_CONFIRMED) {
+                                buttonHangup.setText("Hangup");
+                        } else if (ci.getState() == pjsip_inv_state.PJSIP_INV_STATE_DISCONNECTED) {
+                                buttonHangup.setText("OK");
+                                call_state = "Call disconnected: " + ci.getLastReason();
+                                MainActivity.currentCall = null;
+                        }
+                }
+                
+                tvPeer.setText(ci.getRemoteUri());
+                tvState.setText(call_state);
+        }
 }

pjproject/branches/projects/pjsua2/pjsip-apps/src/swig/java/android/src/org/pjsip/pjsua2/app/MainActivity.java

@@ -44 +44 @@
 
 public class MainActivity extends Activity implements Handler.Callback, MyAppObserver {
-        public static MyApp app = new MyApp();
+        public static MyApp app = null;
         public static MyCall currentCall = null;
         public static MyAccount account = null;
@@ -81 +81 @@
                 setContentView(R.layout.activity_main);
                 
-            app.init(this, getFilesDir().getAbsolutePath());
+                if (app == null) {
+                        app = new MyApp();
+                    app.init(this, getFilesDir().getAbsolutePath());
+                }
+                
             if (app.accList.size() == 0) {
                 accCfg = new AccountConfig();
@@ -177 +181 @@
                                 //buddyListView.performItemClick(buddyListView, buddyListSelectedIdx,
                                 //                                                         buddyListView.getItemIdAtPosition(buddyListSelectedIdx));
+                                
+                                /* Return back Call activity */
+                                notifyCallState(currentCall);
                         }