cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2233 from open-keychain/licenses

Browse Source 
Include license texts in-app
This commit is contained in:
Dominik Schürmann
2017-12-07 12:30:25 +01:00
committed by GitHub
parent 55df2a3d05 6f9d4eae01
commit 00e933b8d3
4 changed files with 933 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java
View File

@@ -42,7 +42,8 @@ public class HelpActivity extends BaseActivity {
public static final int TAB_FAQ = 2;
public static final int TAB_DONATE = 3;
public static final int TAB_CHANGELOG = 4;
public static final int TAB_ABOUT = 5;
public static final int TAB_LICENSES = 5;
public static final int TAB_ABOUT = 6;
// Google Play
private static final String[] GOOGLE_PLAY_CATALOG = new String[]{"keychain.donation.1",
@@ -118,6 +119,11 @@ public class HelpActivity extends BaseActivity {
mTabsAdapter.addTab(HelpMarkdownFragment.class, changelogBundle,
getString(R.string.help_tab_changelog));
Bundle licensesBundle = new Bundle();
licensesBundle.putInt(HelpMarkdownFragment.ARG_MARKDOWN_RES, R.raw.help_licenses);
mTabsAdapter.addTab(HelpMarkdownFragment.class, licensesBundle,
getString(R.string.help_tab_license));
mTabsAdapter.addTab(HelpAboutFragment.class, null,
getString(R.string.help_tab_about));