commit 975128424bad893d75e68175800351a15f449a70
author Adrien Béraud <adrienberaud@gmail.com> Thu Sep 19 13:37:19 2013 +1000
committer Adrien Béraud <adrienberaud@gmail.com> Thu Sep 19 13:37:19 2013 +1000
tree 2832e402bf95f79f309bb0fbbc9ba378c2083c17
parent e78d06f154ddfb4e32408e1ac9892adbc2353f27

Using Android standard activity result code.

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

diff --git a/src/com/savoirfairelinux/sflphone/fragments/CallFragment.java b/src/com/savoirfairelinux/sflphone/fragments/CallFragment.java
index 0512457..42c4f73 100644
--- a/src/com/savoirfairelinux/sflphone/fragments/CallFragment.java
+++ b/src/com/savoirfairelinux/sflphone/fragments/CallFragment.java
@@ -240,7 +240,7 @@
                     e.printStackTrace();
                 }
                 break;
-            case TransferDFragment.RESULT_TRANSFER_CANCEL:
+            case Activity.RESULT_CANCELED:
             default:
                 model.clear();
                 initNormalStateDisplay();

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

diff --git a/src/com/savoirfairelinux/sflphone/fragments/TransferDFragment.java b/src/com/savoirfairelinux/sflphone/fragments/TransferDFragment.java
index 7308e47..c77949a 100644
--- a/src/com/savoirfairelinux/sflphone/fragments/TransferDFragment.java
+++ b/src/com/savoirfairelinux/sflphone/fragments/TransferDFragment.java
@@ -4,6 +4,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
@@ -40,9 +41,8 @@
 import com.savoirfairelinux.sflphone.model.SipCall;
 
 public class TransferDFragment extends DialogFragment implements LoaderManager.LoaderCallbacks<Bundle> {
-    public static final int RESULT_TRANSFER_CANCEL = 0;
-    public static final int RESULT_TRANSFER_CONF = 1;
-    public static final int RESULT_TRANSFER_NUMBER = 2;
+    public static final int RESULT_TRANSFER_CONF = Activity.RESULT_FIRST_USER + 1;
+    public static final int RESULT_TRANSFER_NUMBER = Activity.RESULT_FIRST_USER + 2;
 
     private AutoCompleteTextView mEditText;
     private AutoCompleteAdapter autoCompleteAdapter;
@@ -83,6 +83,7 @@
                 Intent in = new Intent();
                 in.putExtra("target", mAdapter.getItem(pos));
                 in.putExtra("transfer", call_selected);
+
                 getTargetFragment().onActivityResult(getTargetRequestCode(), RESULT_TRANSFER_CONF, in);
                 dismiss();
             }
@@ -102,7 +103,7 @@
                 }).setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int whichButton) {
-                        getTargetFragment().onActivityResult(getTargetRequestCode(), RESULT_TRANSFER_CANCEL, new Intent());
+                        getTargetFragment().onActivityResult(getTargetRequestCode(), Activity.RESULT_CANCELED, new Intent());
                         dismiss();
                     }
                 }).create();