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

Merge branch 'crash-button' into 'master'

Browse Source 
Add crash button to UI in debug mode

See merge request akwizgran/briar!801
This commit is contained in:
akwizgran
2018-05-16 11:19:15 +00:00
parent 135cf086f6 6735e5075b
commit ed2c0336ed
2 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
View File

@@ -12,6 +12,7 @@ import android.support.v7.preference.CheckBoxPreference;
import android.support.v7.preference.ListPreference; import android.support.v7.preference.ListPreference;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceFragmentCompat; import android.support.v7.preference.PreferenceFragmentCompat;
import android.support.v7.preference.PreferenceGroup;
import android.widget.Toast; import android.widget.Toast;
import org.acra.ACRA; import org.acra.ACRA;
@@ -149,9 +150,17 @@ public class SettingsFragment extends PreferenceFragmentCompat
return true; return true;
}); });
Preference testData = findPreference("pref_key_test_data"); if (IS_DEBUG_BUILD) {
if (!IS_DEBUG_BUILD) { findPreference("pref_key_explode").setOnPreferenceClickListener(
testData.setVisible(false); preference -> {
throw new RuntimeException("Boom!");
}
);
} else {
PreferenceGroup testing =
findPreference("pref_key_explode").getParent();
if (testing == null) throw new AssertionError();
testing.setVisible(false);
} }
loadSettings(); loadSettings();

32
briar-android/src/main/res/xml/settings.xml
View File

@@ -111,21 +111,29 @@
<PreferenceCategory <PreferenceCategory
android:layout="@layout/preferences_category" 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 <Preference
android:key="pref_key_send_feedback" android:key="pref_key_test_data"
android:title="@string/send_feedback"/> android:title="Create Test Data">
<intent
android:targetClass="org.briarproject.briar.android.test.TestDataActivity"
android:targetPackage="@string/app_package"/>
</Preference>
<Preference
android:key="pref_key_explode"
android:title="Crash"/>
</PreferenceCategory> </PreferenceCategory>
<Preference
android:key="pref_key_test_data"
android:title="Create Test Data">
<intent
android:targetClass="org.briarproject.briar.android.test.TestDataActivity"
android:targetPackage="@string/app_package"/>
</Preference>
</PreferenceScreen> </PreferenceScreen>