commit 5ed2c97e21d51d033fc90bfad12918f0296d3c0e
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Fri Oct 11 15:36:33 2013 -0400
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Fri Oct 11 15:36:33 2013 -0400
tree 718c395ae97360db3e4fbdfe227e9dd1af7050ce
parent ccf0c93848f48e1bf5d050382bf35a569d4d8496

* #31377: cleaning

src/org/sflphone/client/CallActivity.java

diff --git a/src/org/sflphone/client/CallActivity.java b/src/org/sflphone/client/CallActivity.java
index 41f547d..6163181 100644
--- a/src/org/sflphone/client/CallActivity.java
+++ b/src/org/sflphone/client/CallActivity.java
@@ -37,13 +37,11 @@
 
 import org.sflphone.R;
 import org.sflphone.fragments.CallFragment;
-import org.sflphone.fragments.CallListFragment;
 import org.sflphone.interfaces.CallInterface;
 import org.sflphone.model.Account;
 import org.sflphone.model.CallContact;
 import org.sflphone.model.Conference;
 import org.sflphone.model.SipCall;
-import org.sflphone.model.SipCall.state;
 import org.sflphone.receivers.CallReceiver;
 import org.sflphone.service.CallManagerCallBack;
 import org.sflphone.service.ISipService;
@@ -275,15 +273,17 @@
             HashMap<String, SipCall> callMap = (HashMap<String, SipCall>) service.getCallList();
             HashMap<String, Conference> confMap = (HashMap<String, Conference>) service.getConferenceList();
 
-            if (callMap.size() == 0 && confMap.size() == 0) {
-                finish();
-            }
-
-            if (callMap.size() > 0) {
-                // ArrayList<SipCall> calls = new ArrayList<SipCall>(callMap.values());
-                // HashMap<String, String> details = (HashMap<String, String>) service.getCallDetails(calls.get(0).getCallId());
-
-            }
+//            Log.i(TAG, "call size"+callMap.size());
+//            Log.i(TAG, "call size"+confMap.size());
+//            if (callMap.size() == 0 && confMap.size() == 0) {
+//                finish();
+//            }
+//
+//            if (callMap.size() > 0) {
+//                // ArrayList<SipCall> calls = new ArrayList<SipCall>(callMap.values());
+//                // HashMap<String, String> details = (HashMap<String, String>) service.getCallDetails(calls.get(0).getCallId());
+//
+//            }
         } catch (RemoteException e) {
 
             Log.e(TAG, e.toString());
@@ -340,6 +340,7 @@
         super.onBackPressed();
         Intent launchHome = new Intent(this, SFLPhoneHomeActivity.class);
         launchHome.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
+        launchHome.addFlags(Intent.FLAG_ACTIVITY_SINGLE_TOP);
         startActivity(launchHome);
     }
 
@@ -371,6 +372,7 @@
         mCurrentCallFragment.getBubbleView().stopThread();
         getFragmentManager().beginTransaction().remove(mCurrentCallFragment).commit();
         mCurrentCallFragment = null;
+        finish();
 
     }
 

src/org/sflphone/client/SFLPhoneHomeActivity.java

diff --git a/src/org/sflphone/client/SFLPhoneHomeActivity.java b/src/org/sflphone/client/SFLPhoneHomeActivity.java
index 8bb21f5..7cd295f 100644
--- a/src/org/sflphone/client/SFLPhoneHomeActivity.java
+++ b/src/org/sflphone/client/SFLPhoneHomeActivity.java
@@ -31,6 +31,7 @@
  */
 package org.sflphone.client;
 
+import java.io.InvalidObjectException;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -226,7 +227,7 @@
         super.onPostCreate(savedInstanceState);
         // Sync the toggle state after onRestoreInstanceState has occurred.
         mDrawerToggle.syncState();
-        if(mDrawer.isOpened()){
+        if (mDrawer.isOpened()) {
             getActionBar().hide();
         }
     }
@@ -259,7 +260,6 @@
         intentFilter.addAction(CallManagerCallBack.INCOMING_TEXT);
         intentFilter.addAction(CallManagerCallBack.CALL_STATE_CHANGED);
         registerReceiver(callReceiver, intentFilter);
-        
 
     }
 
@@ -500,10 +500,8 @@
                     cSip.close();
                     callBuilder.setContact(c);
                     launchCallActivity(callBuilder.build());
-                } catch (RemoteException e1) {
-                    Log.e(TAG, e1.toString());
-                } catch (Exception e) {
-                    Log.e(TAG, e.toString());
+                } catch (InvalidObjectException e) {
+                    e.printStackTrace();
                 }
 
             }
@@ -532,7 +530,8 @@
                 Log.e(TAG, e.toString());
             }
         } else {
-            createNotRegisteredDialog().show();;
+            createNotRegisteredDialog().show();
+            ;
         }
 
     }
@@ -545,7 +544,7 @@
                 .setTitle(getResources().getString(R.string.cannot_pass_sipcall_title))
                 .setPositiveButton(getResources().getString(android.R.string.ok), new DialogInterface.OnClickListener() {
                     public void onClick(DialogInterface dialog, int whichButton) {
-                        
+
                     }
                 });