commit 58356b772722ce4b80fcdd4e5a2361a871a116ef
author alision <alexandre.lision@savoirfairelinux.com> Mon Jun 03 17:13:36 2013 -0400
committer alision <alexandre.lision@savoirfairelinux.com> Mon Jun 03 17:13:36 2013 -0400
tree 92ae2535a90d37654e99a44eb43f8f283ae1574a
parent 2cb9956373f43f2e9eaa35c6bb06a55d82b6cf10

* #25382 Added callbacks in JNI
* #25376 Modified handling of touch events to detect longpress

src/com/savoirfairelinux/sflphone/fragments/CallElementListFragment.java

diff --git a/src/com/savoirfairelinux/sflphone/fragments/CallElementListFragment.java b/src/com/savoirfairelinux/sflphone/fragments/CallElementListFragment.java
index 361adc1..3d24cb4 100644
--- a/src/com/savoirfairelinux/sflphone/fragments/CallElementListFragment.java
+++ b/src/com/savoirfairelinux/sflphone/fragments/CallElementListFragment.java
@@ -116,7 +116,6 @@
     @Override
     public void onResume(){
         super.onResume();
-        Log.i(TAG,"RESUMING MAIN FRAG BORDEL");
         if (mCallbacks.getService() != null) {
             try {
                 HashMap<String, SipCall> calls = (HashMap<String, SipCall>) mCallbacks.getService().getCallList();

src/com/savoirfairelinux/sflphone/fragments/ContactListFragment.java

diff --git a/src/com/savoirfairelinux/sflphone/fragments/ContactListFragment.java b/src/com/savoirfairelinux/sflphone/fragments/ContactListFragment.java
index 6db2cbd..3fd80fa 100644
--- a/src/com/savoirfairelinux/sflphone/fragments/ContactListFragment.java
+++ b/src/com/savoirfairelinux/sflphone/fragments/ContactListFragment.java
@@ -109,6 +109,10 @@
         public void onContactDragged() {
         }
 
+        @Override
+        public void openDrawer() {
+        }
+
     };
 
     public interface Callbacks {
@@ -118,6 +122,8 @@
 
         void onContactDragged();
 
+        void openDrawer();
+
     }
 
     @Override
@@ -249,6 +255,8 @@
 
     @Override
     public boolean onQueryTextChange(String newText) {
+        
+        Log.i(TAG,"onQueryTextChangeonQueryTextChangeonQueryTextChangeonQueryTextChangeonQueryTextChangeonQueryTextChangeonQueryTextChangeonQueryTextChangeonQueryTextChangeonQueryTextChangeonQueryTextChange");
         // Called when the action bar search text has changed. Update
         // the search filter, and restart the loader to do a new query
         // with this filter.
@@ -268,6 +276,7 @@
 
     @Override
     public boolean onQueryTextSubmit(String query) {
+        Log.i(TAG,"onQueryTextSubmitonQueryTextSubmitonQueryTextSubmitonQueryTextSubmitonQueryTextSubmitonQueryTextSubmitonQueryTextSubmit");
         // Return false to let the SearchView perform the default action
         return false;
     }
@@ -312,7 +321,14 @@
 //        ((ImageButton) handle.findViewById(R.id.contact_search)).setTag(R.id.contact_search, false);
         
         ((SearchView)mHandle.findViewById(R.id.contact_search_text)).setOnQueryTextListener(this);
-        
+        ((SearchView)mHandle.findViewById(R.id.contact_search_text)).setOnSearchClickListener(new OnClickListener() {
+            
+            @Override
+            public void onClick(View v) {
+                mCallbacks.openDrawer();
+                
+            }
+        });
         
 //        ((ImageButton) mHandle.findViewById(R.id.contact_search)).setOnClickListener(new OnClickListener() {
 //

src/com/savoirfairelinux/sflphone/fragments/DialingFragment.java

diff --git a/src/com/savoirfairelinux/sflphone/fragments/DialingFragment.java b/src/com/savoirfairelinux/sflphone/fragments/DialingFragment.java
index 10d6300..f50defb 100644
--- a/src/com/savoirfairelinux/sflphone/fragments/DialingFragment.java
+++ b/src/com/savoirfairelinux/sflphone/fragments/DialingFragment.java
@@ -37,6 +37,7 @@
 import android.app.Fragment;
 import android.app.LoaderManager.LoaderCallbacks;
 import android.content.Context;
+import android.content.Intent;
 import android.content.Loader;
 import android.os.Bundle;
 import android.util.Log;
@@ -52,6 +53,7 @@
 import android.widget.ImageButton;
 import android.widget.RadioButton;
 import android.widget.Spinner;
+import android.widget.Toast;
 
 import com.savoirfairelinux.sflphone.R;
 import com.savoirfairelinux.sflphone.adapters.AccountSelectionAdapter;
@@ -109,12 +111,13 @@
         }
 
         mCallbacks = (Callbacks) activity;
-        
+
     }
 
     @Override
     public void onDetach() {
         super.onDetach();
+        mCallbacks = sDummyCallbacks;
     }
 
     @Override
@@ -126,7 +129,7 @@
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup parent, Bundle savedInstanceState) {
         View inflatedView = inflater.inflate(R.layout.frag_dialing, parent, false);
-        
+
         spinnerAccounts = (Spinner) inflatedView.findViewById(R.id.account_selection);
 
         spinnerAccounts.setOnItemSelectedListener(new OnItemSelectedListener() {
@@ -159,7 +162,11 @@
 
                 Account account = mAdapter.getSelectedAccount();
                 String to = textField.getText().toString();
-                mCallbacks.onCallDialed(account.getAccountID(), to);
+                if (to.contentEquals("")) {
+                    Toast.makeText(getActivity(), "Enter a number", Toast.LENGTH_LONG).show();
+                } else {
+                    mCallbacks.onCallDialed(account.getAccountID(), to);
+                }
             }
         });
 
@@ -184,12 +191,12 @@
         });
 
         isReady = true;
-        
+
         return inflatedView;
     }
-    
+
     @Override
-    public void onResume(){
+    public void onResume() {
         super.onResume();
         if (mCallbacks.getService() != null) {
 
@@ -244,4 +251,16 @@
 
     }
 
+    public void updateAllAccounts() {
+        getActivity().getLoaderManager().initLoader(555, null, this);
+
+    }
+
+    public void updateAccount(Intent accountState) {
+
+        if (mAdapter != null)
+            mAdapter.updateAccount(accountState);
+
+    }
+
 }