commit 48240e8f1525afbc647c9aaffc825c3073b6d409
author Alexandre Savard <alexandre.savard@savoirfairelinux.com> Fri Oct 26 10:36:03 2012 -0400
committer Alexandre Savard <alexandre.savard@savoirfairelinux.com> Fri Oct 26 10:36:03 2012 -0400
tree acbfe89053315e63ab229e73b74b21a8b0b44247
parent cb66fa40707473105d43e51b132ba2b3fd3adbd1

#16987: Fix Hangup action when call is in state NULL in CallActivity

src/com/savoirfairelinux/sflphone/client/CallActivity.java

diff --git a/src/com/savoirfairelinux/sflphone/client/CallActivity.java b/src/com/savoirfairelinux/sflphone/client/CallActivity.java
index 9b11152..4bf65b7 100644
--- a/src/com/savoirfairelinux/sflphone/client/CallActivity.java
+++ b/src/com/savoirfairelinux/sflphone/client/CallActivity.java
@@ -127,7 +127,9 @@
                 mCall.notifyServiceAnswer(service);
                 break;
             case R.id.buttonhangup:
-                if(mCall.getCallStateInt() == SipCall.CALL_STATE_CURRENT) {
+                if((mCall.getCallStateInt() == SipCall.CALL_STATE_NONE) ||
+                   (mCall.getCallStateInt() == SipCall.CALL_STATE_CURRENT)) {
+
                     mCall.notifyServiceHangup(service);
                     finish();
                 }

src/com/savoirfairelinux/sflphone/client/SFLPhoneHome.java

diff --git a/src/com/savoirfairelinux/sflphone/client/SFLPhoneHome.java b/src/com/savoirfairelinux/sflphone/client/SFLPhoneHome.java
index e34696e..c8bccc4 100644
--- a/src/com/savoirfairelinux/sflphone/client/SFLPhoneHome.java
+++ b/src/com/savoirfairelinux/sflphone/client/SFLPhoneHome.java
@@ -85,7 +85,6 @@
     private String incomingCallID = "";
     private static final int REQUEST_CODE_PREFERENCES = 1;
     ImageButton buttonCall, buttonHangup;
-    Button buttonService;
     static Animation animation;
     ContactListFragment mContactListFragment;
     CallElementList mCallElementList;
@@ -95,6 +94,10 @@
     public AccountList mAccountList = new AccountList();
     public CallList mCallList = new CallList(this);
 
+    private static final int ACTION_BAR_TAB_CONTACT = 0;
+    private static final int ACTION_BAR_TAB_CALL = 1;
+    private static final int ACTION_BAR_TAB_HISTORY = 2;
+
     /**
      * The {@link ViewPager} that will host the section contents.
      */
@@ -154,7 +157,7 @@
             actionBar.addTab(actionBar.newTab().setIcon(icon_res_id[i]).setText(mSectionsPagerAdapter.getPageTitle(i)).setTabListener(this));
         }
 
-        actionBar.setSelectedNavigationItem(1);
+        actionBar.setSelectedNavigationItem(ACTION_BAR_TAB_CALL);
 
         buttonCall = (ImageButton) findViewById(R.id.buttonCall);
         buttonHangup = (ImageButton) findViewById(R.id.buttonHangUp);