sip: fix account creation and settings

Change-Id: I446263d6a272ea566d0e15e3ecee3b46cbc60878

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

@@ -23,7 +23,7 @@ import android.os.Bundle;
 import androidx.annotation.NonNull;
 import androidx.preference.EditTextPreference;
 import androidx.preference.Preference;
-import androidx.preference.SwitchPreferenceCompat;
+import androidx.preference.SwitchPreference;
 import androidx.preference.TwoStatePreference;
 import android.view.inputmethod.EditorInfo;
 
@@ -86,7 +86,7 @@ public class GeneralAccountFragment extends BasePreferenceFragment<GeneralAccoun
 
         setPreferenceDetails(account.getConfig());
 
-        SwitchPreferenceCompat pref = (SwitchPreferenceCompat) findPreference("Account.status");
+        SwitchPreference pref = (SwitchPreference) findPreference("Account.status");
         if (account.isSip() && pref != null) {
             String status;
             pref.setTitle(account.getAlias());

ring-android/libringclient/src/main/java/cx/ring/wizard/SIPCreationPresenter.java

@@ -142,11 +142,12 @@ public class SIPCreationPresenter extends RootPresenter<SIPCreationView> {
                 .subscribeWith(new DisposableObserver<Account>() {
                     @Override
                     public void onNext(Account account) {
+                        mAccount = account;
                         switch (account.getRegistrationState()) {
                             case AccountConfig.STATE_REGISTERED:
                             case AccountConfig.STATE_SUCCESS:
                             case AccountConfig.STATE_READY:
-                                saveProfile(mAccount.getAccountID());
+                                saveProfile(account.getAccountID());
                                 getView().showRegistrationSuccess();
                                 dispose();
                                 break;