account: add sip account status in settings

The account management screen serves only to toggle account status
(enabled/disabled)
The account status and toggle are now in the account setting screen.

Change-Id: Idf257ff9d6c168c6b74ab95ec68c131ad2799ce0
Tuleap: #1218

ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountFragment.java

@@ -24,6 +24,7 @@ import android.os.Bundle;
 import android.support.v14.preference.PreferenceFragment;
 import android.support.v7.preference.EditTextPreference;
 import android.support.v7.preference.Preference;
+import android.support.v7.preference.SwitchPreferenceCompat;
 import android.support.v7.preference.TwoStatePreference;
 import android.util.Log;
 import android.view.inputmethod.EditorInfo;
@@ -69,9 +70,35 @@ public class GeneralAccountFragment extends PreferenceFragment implements Accoun
     }
 
     @Override
-    public void accountChanged(Account acc) {
-        setPreferenceDetails(acc.getConfig());
-        setPreferenceListener(acc.getConfig(), changeBasicPreferenceListener);
+    public void accountChanged(Account account) {
+        setPreferenceDetails(account.getConfig());
+        setPreferenceListener(account.getConfig(), changeBasicPreferenceListener);
+        SwitchPreferenceCompat pref = (SwitchPreferenceCompat) findPreference("Account.status");
+        if (account.isSip() && pref != null) {
+            String status;
+            pref.setTitle(account.getAlias());
+            pref.setOnPreferenceChangeListener(changeAccountStatusListener);
+            if (account.isEnabled()) {
+                if (account.isTrying()) {
+                    status = getString(R.string.account_status_connecting);
+                } else if (account.needsMigration()) {
+                    status = getString(R.string.account_update_needed);
+                } else if (account.isInError()) {
+                    status = getString(R.string.account_status_connection_error);
+                } else if (account.isRegistered()) {
+                    status = getString(R.string.account_status_online);
+                } else {
+                    status = getString(R.string.account_status_unknown);
+                }
+            } else {
+                status = getString(R.string.account_status_offline);
+            }
+            pref.setSummary(status);
+            pref.setChecked(account.isEnabled());
+
+            // An ip2ip account is always ready
+            pref.setEnabled(!account.isIP2IP());
+        }
     }
 
     @Override
@@ -131,7 +158,9 @@ public class GeneralAccountFragment extends PreferenceFragment implements Accoun
     private void setPreferenceDetails(AccountConfig details) {
         for (ConfigKey confKey : details.getKeys()) {
             Preference pref = findPreference(confKey.key());
-            if (pref != null) {
+            if (pref == null) {
+                continue;
+            }
             if (!confKey.isTwoState()) {
                 String val = details.get(confKey);
                 ((EditTextPreference) pref).setText(val);
@@ -149,7 +178,6 @@ public class GeneralAccountFragment extends PreferenceFragment implements Accoun
             }
         }
     }
-    }
 
     private void setPreferenceListener(AccountConfig details, Preference.OnPreferenceChangeListener listener) {
         for (ConfigKey confKey : details.getKeys()) {
@@ -160,6 +188,19 @@ public class GeneralAccountFragment extends PreferenceFragment implements Accoun
         }
     }
 
+    private final Preference.OnPreferenceChangeListener changeAccountStatusListener = new Preference.OnPreferenceChangeListener() {
+
+        @Override
+        public boolean onPreferenceChange(Preference preference, Object newValue) {
+            final Account account = mCallbacks.getAccount();
+            if (account != null) {
+                account.setEnabled((Boolean) newValue);
+                mCallbacks.saveAccount();
+            }
+            return false;
+        }
+    };
+
     private final Preference.OnPreferenceChangeListener changeBasicPreferenceListener = new Preference.OnPreferenceChangeListener() {
         @Override
         public boolean onPreferenceChange(Preference preference, Object newValue) {

ring-android/app/src/main/res/xml/account_general_prefs.xml

@@ -22,6 +22,11 @@ along with this program; if not, write to the Free Software
 -->
 <android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" >
 
+    <android.support.v7.preference.SwitchPreferenceCompat
+        android:id="@+id/account_status"
+        android:key="Account.status"
+        android:persistent="false" />
+
     <android.support.v7.preference.PreferenceCategory
         android:id="@+id/account_basic_category"
         android:title="@string/account_basic_category" >