Merge keybase-proof branch

1 files changed, 5 insertions, 0 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java
index 37f9113bb..894529cc5 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyAdvActivity.java
@@ -144,6 +144,11 @@ public class ViewKeyAdvActivity extends BaseActivity implements
         mTabsAdapter.addTab(ViewKeyAdvCertsFragment.class,
                 certsBundle, getString(R.string.key_view_tab_certs));
 
+        Bundle trustBundle = new Bundle();
+        trustBundle.putParcelable(ViewKeyTrustFragment.ARG_DATA_URI, dataUri);
+        mTabsAdapter.addTab(ViewKeyTrustFragment.class,
+                trustBundle, getString(R.string.key_view_tab_keybase));
+
         // update layout after operations
         mSlidingTabLayout.setViewPager(mViewPager);
     }