commit 0038a614fe4feaf415adb5ef1d265a982a31d65f
author Emeric Vigier <emeric.vigier@savoirfairelinux.com> Tue Nov 06 18:51:19 2012 -0500
committer Emeric Vigier <emeric.vigier@savoirfairelinux.com> Tue Nov 06 19:12:56 2012 -0500
tree bfaed1a7c0b899817293f5c2ebb1cdda6b78842f
parent 131795243a94e66ae957eb7046c21c813aa52552

#17220: fix service NullPointerException issue

Conflicts:

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

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

diff --git a/src/com/savoirfairelinux/sflphone/client/AccountManagementFragment.java b/src/com/savoirfairelinux/sflphone/client/AccountManagementFragment.java
index faf8f72..23f3bfe 100644
--- a/src/com/savoirfairelinux/sflphone/client/AccountManagementFragment.java
+++ b/src/com/savoirfairelinux/sflphone/client/AccountManagementFragment.java
@@ -72,7 +72,7 @@
     static final int ACCOUNT_CREATE_REQUEST = 1;
     static final int ACCOUNT_EDIT_REQUEST = 2;
     private SFLPhonePreferenceActivity sflphonePreferenceActivity;
-    private ISipService service;
+    private ISipService service = null;
 
     ArrayList<AccountDetail.PreferenceEntry> basicDetailKeys = null;
     ArrayList<AccountDetail.PreferenceEntry> advancedDetailKeys = null;
@@ -106,6 +106,19 @@
 
         Log.i(TAG, "Create Account Management Fragment");
 
+        /*
+         * FIXME if service cannot be obtained from SFLPhonePreferenceActivity,
+         * then get it from Application
+         */
+        service = sflphonePreferenceActivity.getSipService();
+        if (service == null) {
+            service = ((SFLphoneApplication)sflphonePreferenceActivity.getApplication()).getSipService();
+            if (service == null) {
+                Log.e(TAG, "onCreate() service=" + service);
+            }
+        }
+        Log.w(TAG, "onCreate() service=" + service);
+
         setPreferenceScreen(getAccountListPreferenceScreen());
 
         LocalBroadcastManager.getInstance(getActivity()).registerReceiver(mMessageReceiver, new IntentFilter("accounts-changed"));