commit 5f144b8ee0a55548d27bab9ed4b0d61d2cf908a3
author Alexandre Lision <alexandre.lision@savoirfairelinux.com> Tue Feb 11 09:59:36 2014 -0500
committer Alexandre Lision <alexandre.lision@savoirfairelinux.com> Tue Feb 11 09:59:36 2014 -0500
tree acdc51cdb3d1ac7f28264f41c472e32826c78511
parent f135c6fbd3665d922ca96fad6847156ade349aa7

* #40232: Add zrtp module in SipCall

SipCall keeps track of its security state, and store its SAS if needed.
This commit also introduce two new Fragments wrappers, for accounts and calls.
These wrappers reduce code duplication between fragments requiring hooks on daemon
signals.

src/org/sflphone/fragments/CallListFragment.java

diff --git a/src/org/sflphone/fragments/CallListFragment.java b/src/org/sflphone/fragments/CallListFragment.java
index 9aae4b2..86e67ea 100644
--- a/src/org/sflphone/fragments/CallListFragment.java
+++ b/src/org/sflphone/fragments/CallListFragment.java
@@ -35,10 +35,8 @@
 import android.content.ClipData.Item;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.graphics.Color;
 import android.os.*;
-import android.support.v4.app.Fragment;
 import android.util.Log;
 import android.view.DragEvent;
 import android.view.LayoutInflater;
@@ -52,10 +50,7 @@
 import org.sflphone.R;
 import org.sflphone.client.CallActivity;
 import org.sflphone.client.HomeActivity;
-import org.sflphone.interfaces.CallInterface;
 import org.sflphone.model.Conference;
-import org.sflphone.receivers.CallReceiver;
-import org.sflphone.service.CallManagerCallBack;
 import org.sflphone.service.ISipService;
 
 import java.util.ArrayList;
@@ -63,14 +58,13 @@
 import java.util.Observable;
 import java.util.Observer;
 
-public class CallListFragment extends Fragment implements CallInterface {
+public class CallListFragment extends CallableWrapperFragment {
 
     private static final String TAG = CallListFragment.class.getSimpleName();
 
     private Callbacks mCallbacks = sDummyCallbacks;
     private TextView mConversationsTitleTextView;
     CallListAdapter mConferenceAdapter;
-    CallReceiver mCallReceiver;
 
     public static final int REQUEST_TRANSFER = 10;
     public static final int REQUEST_CONF = 20;
@@ -128,7 +122,8 @@
 
     @Override
     public void recordingChanged(Intent intent) {
-
+        Log.i(TAG, "confChanged");
+        updateLists();
     }
 
     /**
@@ -168,11 +163,6 @@
     @Override
     public void onResume() {
         super.onResume();
-        IntentFilter intentFilter = new IntentFilter();
-        intentFilter.addAction(CallManagerCallBack.INCOMING_CALL);
-        intentFilter.addAction(CallManagerCallBack.INCOMING_TEXT);
-        intentFilter.addAction(CallManagerCallBack.CALL_STATE_CHANGED);
-        getActivity().registerReceiver(mCallReceiver, intentFilter);
         if (mCallbacks.getService() != null) {
 
             updateLists();
@@ -206,14 +196,12 @@
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mCallReceiver = new CallReceiver(this);
     }
 
     @Override
     public void onPause() {
         super.onPause();
         mHandler.removeCallbacks(mUpdateTimeTask);
-        getActivity().unregisterReceiver(mCallReceiver);
     }
 
     @Override