Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
briar
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
681
Issues
681
List
Boards
Labels
Service Desk
Milestones
Merge Requests
16
Merge Requests
16
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
briar
briar
Commits
6735e507
Verified
Commit
6735e507
authored
May 04, 2018
by
akwizgran
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add crash button to UI in debug mode.
parent
2c99a75b
Pipeline
#1513
passed with stage
in 7 minutes and 53 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
31 additions
and
14 deletions
+31
-14
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
...briarproject/briar/android/settings/SettingsFragment.java
+12
-3
briar-android/src/main/res/xml/settings.xml
briar-android/src/main/res/xml/settings.xml
+19
-11
No files found.
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
View file @
6735e507
...
...
@@ -12,6 +12,7 @@ import android.support.v7.preference.CheckBoxPreference;
import
android.support.v7.preference.ListPreference
;
import
android.support.v7.preference.Preference
;
import
android.support.v7.preference.PreferenceFragmentCompat
;
import
android.support.v7.preference.PreferenceGroup
;
import
android.widget.Toast
;
import
org.acra.ACRA
;
...
...
@@ -149,9 +150,17 @@ public class SettingsFragment extends PreferenceFragmentCompat
return
true
;
});
Preference
testData
=
findPreference
(
"pref_key_test_data"
);
if
(!
IS_DEBUG_BUILD
)
{
testData
.
setVisible
(
false
);
if
(
IS_DEBUG_BUILD
)
{
findPreference
(
"pref_key_explode"
).
setOnPreferenceClickListener
(
preference
->
{
throw
new
RuntimeException
(
"Boom!"
);
}
);
}
else
{
PreferenceGroup
testing
=
findPreference
(
"pref_key_explode"
).
getParent
();
if
(
testing
==
null
)
throw
new
AssertionError
();
testing
.
setVisible
(
false
);
}
loadSettings
();
...
...
briar-android/src/main/res/xml/settings.xml
View file @
6735e507
...
...
@@ -111,21 +111,29 @@
<PreferenceCategory
android:layout=
"@layout/preferences_category"
android:title=
"@string/feedback_settings_title"
>
android:title=
"@string/feedback_settings_title"
/>
<Preference
android:key=
"pref_key_send_feedback"
android:title=
"@string/send_feedback"
/>
<PreferenceCategory
android:layout=
"@layout/preferences_category"
android:title=
"Testing"
>
<Preference
android:key=
"pref_key_
send_feedback
"
android:title=
"
@string/send_feedback"
/
>
android:key=
"pref_key_
test_data
"
android:title=
"
Create Test Data"
>
</PreferenceCategory>
<intent
android:targetClass=
"org.briarproject.briar.android.test.TestDataActivity"
android:targetPackage=
"@string/app_package"
/>
</Preference>
<Preference
android:key=
"pref_key_test_data
"
android:title=
"Create Test Data"
>
<Preference
android:key=
"pref_key_explode
"
android:title=
"Crash"
/
>
<intent
android:targetClass=
"org.briarproject.briar.android.test.TestDataActivity"
android:targetPackage=
"@string/app_package"
/>
</Preference>
</PreferenceCategory>
</PreferenceScreen>
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