Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
briar
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Julian Dehm
briar
Commits
de8d1b7d
Verified
Commit
de8d1b7d
authored
Sep 27, 2018
by
Torsten Grote
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Allow sign out by trusted non-paired panic apps
parent
9155f62d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
10 deletions
+7
-10
PanicPreferencesFragment.java
...project/briar/android/panic/PanicPreferencesFragment.java
+2
-6
PanicResponderActivity.java
...arproject/briar/android/panic/PanicResponderActivity.java
+5
-3
panic_preferences.xml
briar-android/src/main/res/xml/panic_preferences.xml
+0
-1
No files found.
briar-android/src/main/java/org/briarproject/briar/android/panic/PanicPreferencesFragment.java
View file @
de8d1b7d
...
...
@@ -97,14 +97,12 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat
showPanicApp
(
packageName
);
if
(
packageName
.
equals
(
Panic
.
PACKAGE_NAME_NONE
))
{
lockPref
.
setEnabled
(
false
);
purgePref
.
setChecked
(
false
);
purgePref
.
setEnabled
(
false
);
uninstallPref
.
setChecked
(
false
);
uninstallPref
.
setEnabled
(
false
);
getActivity
().
setResult
(
Activity
.
RESULT_CANCELED
);
}
else
{
lockPref
.
setEnabled
(
true
);
purgePref
.
setEnabled
(
true
);
uninstallPref
.
setEnabled
(
true
);
}
...
...
@@ -179,8 +177,7 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat
panicAppPref
.
setIcon
(
android
.
R
.
drawable
.
ic_menu_close_clear_cancel
);
// disable panic actions
lockPref
.
setEnabled
(
false
);
// disable destructive panic actions
purgePref
.
setEnabled
(
false
);
uninstallPref
.
setEnabled
(
false
);
}
else
{
...
...
@@ -192,8 +189,7 @@ public class PanicPreferencesFragment extends PreferenceFragmentCompat
panicAppPref
.
setIcon
(
pm
.
getApplicationIcon
(
triggerPackageName
));
// enable panic actions
lockPref
.
setEnabled
(
true
);
// enable destructive panic actions
purgePref
.
setEnabled
(
true
);
uninstallPref
.
setEnabled
(
true
);
}
catch
(
PackageManager
.
NameNotFoundException
e
)
{
...
...
briar-android/src/main/java/org/briarproject/briar/android/panic/PanicResponderActivity.java
View file @
de8d1b7d
...
...
@@ -71,11 +71,13 @@ public class PanicResponderActivity extends BriarActivity {
}
else
if
(
sharedPref
.
getBoolean
(
KEY_PURGE
,
false
))
{
LOG
.
info
(
"Purging all data..."
);
deleteAllData
();
}
else
if
(
sharedPref
.
getBoolean
(
KEY_LOCK
,
true
))
{
LOG
.
info
(
"Signing out..."
);
signOut
(
true
);
}
}
// non-destructive actions are allowed by non-connected trusted apps
if
(
sharedPref
.
getBoolean
(
KEY_LOCK
,
true
))
{
LOG
.
info
(
"Signing out..."
);
signOut
(
true
);
}
}
}
...
...
briar-android/src/main/res/xml/panic_preferences.xml
View file @
de8d1b7d
...
...
@@ -10,7 +10,6 @@
<SwitchPreference
android:defaultValue=
"true"
android:enabled=
"false"
android:key=
"pref_key_lock"
android:summary=
"@string/panic_setting_signout_summary"
android:title=
"@string/panic_setting_signout_title"
/>
...
...
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