Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 11:19:04 +01:00
Code Issues Projects Releases Wiki Activity

Get rid of custom switch preference

Browse Source
This commit is contained in:
Torsten Grote
2021-01-22 15:45:32 -03:00
parent 484817db08
commit f0685c4a43
6 changed files with 14 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
briar-android/src/main/java/org/briarproject/briar/android/settings/ConnectionsFragment.java
View File

@@ -16,7 +16,7 @@ import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.ViewModelProvider;
import androidx.preference.ListPreference;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.SwitchPreference;
import androidx.preference.SwitchPreferenceCompat;
import static org.briarproject.briar.android.AppModule.getAndroidComponent;
import static org.briarproject.briar.android.settings.SettingsActivity.enableAndPersist;
@@ -40,12 +40,12 @@ public class ConnectionsFragment extends PreferenceFragmentCompat {
private SettingsViewModel viewModel;
private ConnectionsManager connectionsManager;
private SwitchPreference enableBluetooth;
private SwitchPreference enableWifi;
private SwitchPreference enableTor;
private SwitchPreferenceCompat enableBluetooth;
private SwitchPreferenceCompat enableWifi;
private SwitchPreferenceCompat enableTor;
private ListPreference torNetwork;
private SwitchPreference torMobile;
private SwitchPreference torOnlyWhenCharging;
private SwitchPreferenceCompat torMobile;
private SwitchPreferenceCompat torOnlyWhenCharging;
@Override
public void onAttach(@NonNull Context context) {

4
briar-android/src/main/java/org/briarproject/briar/android/settings/SecurityFragment.java
View File

@@ -16,7 +16,7 @@ import androidx.lifecycle.LifecycleOwner;
import androidx.lifecycle.ViewModelProvider;
import androidx.preference.ListPreference;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.SwitchPreference;
import androidx.preference.SwitchPreferenceCompat;
import static android.os.Build.VERSION.SDK_INT;
import static java.util.Objects.requireNonNull;
@@ -36,7 +36,7 @@ public class SecurityFragment extends PreferenceFragmentCompat {
ViewModelProvider.Factory viewModelFactory;
private SettingsViewModel viewModel;
private SwitchPreference screenLock;
private SwitchPreferenceCompat screenLock;
private ListPreference screenLockTimeout;
@Override