Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Julian Dehm
briar
Commits
90cb9a2f
Verified
Commit
90cb9a2f
authored
Aug 01, 2018
by
Torsten Grote
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Disable screen lock setting instead of hiding it when not available
parent
fc86319e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
8 deletions
+10
-8
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
...briarproject/briar/android/settings/SettingsFragment.java
+8
-7
briar-android/src/main/res/values/strings.xml
briar-android/src/main/res/values/strings.xml
+1
-0
briar-android/src/main/res/xml/settings.xml
briar-android/src/main/res/xml/settings.xml
+1
-1
No files found.
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
View file @
90cb9a2f
...
...
@@ -205,12 +205,7 @@ public class SettingsFragment extends PreferenceFragmentCompat
enableBluetooth
.
setOnPreferenceChangeListener
(
this
);
torNetwork
.
setOnPreferenceChangeListener
(
this
);
torBlocked
.
setOnPreferenceChangeListener
(
this
);
if
(
getActivity
()
!=
null
&&
hasScreenLock
(
getActivity
()))
{
screenLock
.
setVisible
(
FEATURE_FLAG_PIN_LOCK
);
screenLock
.
setOnPreferenceChangeListener
(
this
);
}
else
{
screenLock
.
setVisible
(
false
);
}
screenLock
.
setOnPreferenceChangeListener
(
this
);
if
(
SDK_INT
>=
21
)
{
notifyLockscreen
.
setVisible
(
true
);
notifyLockscreen
.
setOnPreferenceChangeListener
(
this
);
...
...
@@ -231,6 +226,7 @@ public class SettingsFragment extends PreferenceFragmentCompat
}
else
{
theme
.
setVisible
(
FEATURE_FLAG_DARK_THEME
);
notifySignIn
.
setVisible
(
FEATURE_FLAG_SIGN_IN_REMINDER
);
screenLock
.
setVisible
(
FEATURE_FLAG_PIN_LOCK
);
findPreference
(
"pref_key_explode"
).
setVisible
(
false
);
findPreference
(
"pref_key_test_data"
).
setVisible
(
false
);
...
...
@@ -428,7 +424,12 @@ public class SettingsFragment extends PreferenceFragmentCompat
enableBluetooth
.
setEnabled
(
enabled
);
torNetwork
.
setEnabled
(
enabled
);
torBlocked
.
setEnabled
(
enabled
);
screenLock
.
setEnabled
(
enabled
);
if
(
enabled
&&
getActivity
()
!=
null
&&
hasScreenLock
(
getActivity
()))
{
screenLock
.
setEnabled
(
true
);
}
else
{
screenLock
.
setEnabled
(
false
);
screenLock
.
setSummary
(
getString
(
R
.
string
.
lock_disabled
));
}
notifyPrivateMessages
.
setEnabled
(
enabled
);
notifyGroupMessages
.
setEnabled
(
enabled
);
notifyForumPosts
.
setEnabled
(
enabled
);
...
...
briar-android/src/main/res/values/strings.xml
View file @
90cb9a2f
...
...
@@ -452,5 +452,6 @@
<string
name=
"lock_unlock"
>
Unlock Briar
</string>
<string
name=
"lock_is_locked"
>
Briar is locked
</string>
<string
name=
"lock_tap_to_unlock"
>
Tap to unlock
</string>
<string
name=
"lock_disabled"
>
Only available on Android 5 or newer and when a system screen lock is set
</string>
</resources>
briar-android/src/main/res/xml/settings.xml
View file @
90cb9a2f
...
...
@@ -61,7 +61,7 @@
android:persistent=
"false"
android:summary=
"@string/pref_lock_summary"
android:title=
"@string/pref_lock_title"
android:
visibility=
"gon
e"
/>
android:
enabled=
"fals
e"
/>
<Preference
android:key=
"pref_key_change_password"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment