commit 465ceba11aa4a0d230dde8c05de07be9f01a6f4b
author alision <alexandre.lision@savoirfairelinux.com> Thu Jul 04 09:24:30 2013 -0400
committer alision <alexandre.lision@savoirfairelinux.com> Thu Jul 04 09:24:30 2013 -0400
tree 966057f2c2a63c568a6f0b7eee3f019924cad66a
parent 91d2859625c216bc6d6f4b2647ce41a3cc68fa6c

* #26787 Replaced buttons by DnD

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 16c47e1..2da13ec 100644
--- a/src/com/savoirfairelinux/sflphone/client/CallActivity.java
+++ b/src/com/savoirfairelinux/sflphone/client/CallActivity.java
@@ -256,6 +256,7 @@
 
         mCallsFragment.update();
 
+        if(mCurrentCallFragment != null)
         mCurrentCallFragment.changeCallState(callID, newState);
 
         try {
@@ -469,6 +470,7 @@
     public void replaceCurrentCallDisplayed() {
         mCurrentCallFragment.getBubbleView().stopThread();
         getFragmentManager().beginTransaction().remove(mCurrentCallFragment).commit();
+        mCurrentCallFragment = null;
 
     }
 

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

diff --git a/src/com/savoirfairelinux/sflphone/client/SFLPhoneHomeActivity.java b/src/com/savoirfairelinux/sflphone/client/SFLPhoneHomeActivity.java
index 098b723..cac9296 100644
--- a/src/com/savoirfairelinux/sflphone/client/SFLPhoneHomeActivity.java
+++ b/src/com/savoirfairelinux/sflphone/client/SFLPhoneHomeActivity.java
@@ -246,14 +246,14 @@
             }
         });
     }
-    
+
     @Override
     protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
         // Sync the toggle state after onRestoreInstanceState has occurred.
         mDrawerToggle.syncState();
     }
-    
+
     @Override
     public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
@@ -360,12 +360,15 @@
         Log.i(TAG, "Launch Call Activity");
         Bundle bundle = new Bundle();
         Conference tmp = new Conference("-1");
+
         tmp.getParticipants().add(infos);
+
         bundle.putParcelable("conference", tmp);
         Intent intent = new Intent().setClass(this, CallActivity.class);
         intent.putExtra("resuming", false);
         intent.putExtras(bundle);
         startActivityForResult(intent, REQUEST_CODE_CALL);
+        overridePendingTransition(R.anim.slide_down, R.anim.slide_up);
     }
 
     /** Defines callbacks for service binding, passed to bindService() */
@@ -425,7 +428,8 @@
             break;
         case REQUEST_CODE_CALL:
             Log.w(TAG, "Result out of CallActivity");
-            getLoaderManager().restartLoader(LoaderConstants.HISTORY_LOADER, null, (HistoryFragment) mSectionsPagerAdapter.getItem(2));
+            if (mSectionsPagerAdapter.getItem(2) != null)
+                getLoaderManager().restartLoader(LoaderConstants.HISTORY_LOADER, null, (HistoryFragment) mSectionsPagerAdapter.getItem(2));
             break;
         }