gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-21 12:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #450

Browse Source 
Signed-off-by: Mario Danic <mario@lovelyhq.com>
This commit is contained in:
Mario Danic 2019-02-14 05:30:13 +01:00
parent 309f5d30c2
commit 50fdb7c49a
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
View File

@ -31,6 +31,7 @@ import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Checkable;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
@ -319,16 +320,16 @@ public class SettingsController extends BaseController {
dispose(null); dispose(null);
getCurrentUser(); getCurrentUser();
if (shouldVibrateSwitchPreference.getVisibility() == View.VISIBLE) {
shouldVibrateSwitchPreference.setActivated(appPreferences.getShouldVibrateSetting());
}
if (!TextUtils.isEmpty(currentUser.getClientCertificate())) { if (!TextUtils.isEmpty(currentUser.getClientCertificate())) {
certificateSetup.setTitle(R.string.nc_client_cert_change); certificateSetup.setTitle(R.string.nc_client_cert_change);
} else { } else {
certificateSetup.setTitle(R.string.nc_client_cert_setup); certificateSetup.setTitle(R.string.nc_client_cert_setup);
} }
if (shouldVibrateSwitchPreference.getVisibility() == View.VISIBLE) {
((Checkable)shouldVibrateSwitchPreference.findViewById(R.id.mp_checkable)).setChecked(appPreferences.getShouldVibrateSetting());
}
String ringtoneName = ""; String ringtoneName = "";
RingtoneSettings ringtoneSettings; RingtoneSettings ringtoneSettings;
if (!TextUtils.isEmpty(appPreferences.getCallRingtoneUri())) { if (!TextUtils.isEmpty(appPreferences.getCallRingtoneUri())) {

2
app/src/main/res/layout/controller_settings.xml
View File

@ -135,7 +135,7 @@
android:id="@+id/settings_always_vibrate" android:id="@+id/settings_always_vibrate"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
apc:mp_default_value="true" apc:mp_default_value="@bool/value_true"
apc:mp_key="@string/nc_settings_vibrate_key" apc:mp_key="@string/nc_settings_vibrate_key"
apc:mp_summary="@string/nc_settings_vibrate_desc" apc:mp_summary="@string/nc_settings_vibrate_desc"
apc:mp_title="@string/nc_settings_vibrate" /> apc:mp_title="@string/nc_settings_vibrate" />