diff options
author | Tim Bray <timbray@gmail.com> | 2014-09-13 09:39:10 -0700 |
---|---|---|
committer | Tim Bray <timbray@gmail.com> | 2014-09-13 21:41:03 -0700 |
commit | 7de86a09bc3bae47c44b9dcb65bbda1298ccf843 (patch) | |
tree | a4f9a8b24958b500ed52415d1f1584a03b865779 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java | |
parent | e14cf32264d92c4b0d4ca782d74a1589ee52a396 (diff) | |
download | open-keychain-7de86a09bc3bae47c44b9dcb65bbda1298ccf843.tar.gz open-keychain-7de86a09bc3bae47c44b9dcb65bbda1298ccf843.tar.bz2 open-keychain-7de86a09bc3bae47c44b9dcb65bbda1298ccf843.zip |
Change shuffle to rotate, and when merging ImportKeysList entries, if either side is revoked/expired, the merge reflects that
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java index b5e0e2ab5..520f0b6a5 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java @@ -43,7 +43,7 @@ public class PreferencesKeyServerActivity extends ActionBarActivity implements O private LayoutInflater mInflater; private ViewGroup mEditors; private View mAdd; - private View mShuffle; + private View mRotate; private TextView mTitle; private TextView mSummary; @@ -82,8 +82,8 @@ public class PreferencesKeyServerActivity extends ActionBarActivity implements O mAdd = findViewById(R.id.add); mAdd.setOnClickListener(this); - mShuffle = findViewById(R.id.shuffle); - mShuffle.setOnClickListener(new OnClickListener() { + mRotate = findViewById(R.id.rotate); + mRotate.setOnClickListener(new OnClickListener() { @Override public void onClick(View view) { Vector<String> servers = serverList(); |