From 568b07b26121aadf993f4bd9c3305fe37c82a778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Mon, 13 Jan 2020 02:05:32 -0500
Subject: [PATCH] preferences: fix saving general preferences
Change-Id: I5e9a9ee91354269beb470b95d610761ca736239c
---
.../main/java/cx/ring/fragments/GeneralAccountFragment.java | 6 ++++--
.../java/cx/ring/fragments/GeneralAccountPresenter.java | 2 +-
.../src/main/java/cx/ring/fragments/GeneralAccountView.java | 2 +-
.../main/java/cx/ring/tv/account/TVSettingsFragment.java | 2 +-
4 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountFragment.java b/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountFragment.java
index 52b24f0b2..80cdcb928 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountFragment.java
@@ -213,9 +213,11 @@ public class GeneralAccountFragment extends BasePreferenceFragment<GeneralAccoun
}
@Override
- public void addJamiPreferences() {
+ public void addJamiPreferences(String accountId) {
+ PreferenceManager pm = getPreferenceManager();
+ pm.setSharedPreferencesMode(Context.MODE_PRIVATE);
+ pm.setSharedPreferencesName(SharedPreferencesServiceImpl.PREFS_ACCOUNT+accountId);
addPreferencesFromResource(R.xml.account_prefs_jami);
-
}
@Override
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountPresenter.java b/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountPresenter.java
index ff8b386fc..1c7f5ccdd 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountPresenter.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountPresenter.java
@@ -61,7 +61,7 @@ public class GeneralAccountPresenter extends RootPresenter<GeneralAccountView> {
mAccount = mAccountService.getAccount(accountId);
if (mAccount != null) {
if (mAccount.isRing()) {
- getView().addJamiPreferences();
+ getView().addJamiPreferences(mAccount.getAccountID());
} else {
getView().addSipPreferences();
}
diff --git a/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountView.java b/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountView.java
index e1fe86384..f0825873f 100644
--- a/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountView.java
+++ b/ring-android/app/src/main/java/cx/ring/fragments/GeneralAccountView.java
@@ -25,7 +25,7 @@ import cx.ring.model.Account;
public interface GeneralAccountView {
- void addJamiPreferences();
+ void addJamiPreferences(String accountId);
void addSipPreferences();
diff --git a/ring-android/app/src/main/java/cx/ring/tv/account/TVSettingsFragment.java b/ring-android/app/src/main/java/cx/ring/tv/account/TVSettingsFragment.java
index 18321675f..5dd1d350d 100644
--- a/ring-android/app/src/main/java/cx/ring/tv/account/TVSettingsFragment.java
+++ b/ring-android/app/src/main/java/cx/ring/tv/account/TVSettingsFragment.java
@@ -77,7 +77,7 @@ public class TVSettingsFragment extends LeanbackSettingsFragmentCompat {
}
@Override
- public void addJamiPreferences() {
+ public void addJamiPreferences(String acccouontId) {
}
--
GitLab