Merge branch 'test_data_config' into 'master' (b9cf1da8) · Commits · Julian Dehm / briar · GitLab

Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

briar
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

b9cf1da8

Commit b9cf1da8 authored 6 years ago by akwizgran

Downloads
- Plain Diff

Merge branch 'test_data_config' into 'master'

Make test data creation configurable.

Closes #1149

See merge request akwizgran/briar!771

parents b30c2a80 69c34ada

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

briar-android/src/main/AndroidManifest.xml 10 additions, 0 deletions

briar-android/src/main/AndroidManifest.xml
briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java 3 additions, 0 deletions

...riarproject/briar/android/activity/ActivityComponent.java
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java 1 addition, 11 deletions

...briarproject/briar/android/settings/SettingsFragment.java
briar-android/src/main/java/org/briarproject/briar/android/test/TestDataActivity.java 100 additions, 0 deletions

...org/briarproject/briar/android/test/TestDataActivity.java
briar-android/src/main/res/layout/activity_test_data.xml 170 additions, 0 deletions

briar-android/src/main/res/layout/activity_test_data.xml
briar-android/src/main/res/xml/settings.xml 7 additions, 2 deletions

briar-android/src/main/res/xml/settings.xml
briar-api/src/main/java/org/briarproject/briar/api/test/TestDataCreator.java 12 additions, 2 deletions

...java/org/briarproject/briar/api/test/TestDataCreator.java
briar-core/src/main/java/org/briarproject/briar/test/TestDataCreatorImpl.java 32 additions, 31 deletions

...java/org/briarproject/briar/test/TestDataCreatorImpl.java

with 335 additions and 46 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment