Go to keyserver settings directly

2 files changed, 4 insertions, 6 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysCloudFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysCloudFragment.java
index be7653b52..91ca93c36 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysCloudFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysCloudFragment.java
@@ -21,6 +21,7 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.preference.PreferenceActivity;
 import android.support.v4.app.Fragment;
 import android.view.KeyEvent;
 import android.view.LayoutInflater;
@@ -110,11 +111,9 @@ public class ImportKeysCloudFragment extends Fragment {
         mConfigButton.setOnClickListener(new OnClickListener() {
             @Override
             public void onClick(View v) {
-                Intent i = new Intent(mImportActivity, SettingsActivity.class);
-                // GRR, for some reason I can’t set the Action or I get an incomprehensible
-                //  exception about “modern two-pane layouts”
-                // i.setAction(PreferencesActivity.ACTION_PREFS_CLOUD);
-                startActivity(i);
+                Intent intent = new Intent(mImportActivity, SettingsActivity.class);
+                intent.putExtra(PreferenceActivity.EXTRA_SHOW_FRAGMENT, SettingsActivity.CloudSearchPrefsFragment.class.getName());
+                startActivity(intent);
             }
         });
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java
index e2fc44689..53986a392 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SettingsActivity.java
@@ -183,7 +183,6 @@ public class SettingsActivity extends PreferenceActivity {
         }
     }
 
-    /* Called only on Honeycomb and later */
     @Override
     public void onBuildHeaders(List<Header> target) {
         super.onBuildHeaders(target);