aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-03-26 16:30:49 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-03-26 16:30:49 +0100
commitdc8b04a79333d13f3e9903757502521348ccec57 (patch)
tree5317cc3aa5356b261be87c740d741ce1ae5de758 /OpenKeychain
parentaa6d0dd86773eda7d0a5a6855b40c2e1f95e2b45 (diff)
downloadopen-keychain-dc8b04a79333d13f3e9903757502521348ccec57.tar.gz
open-keychain-dc8b04a79333d13f3e9903757502521348ccec57.tar.bz2
open-keychain-dc8b04a79333d13f3e9903757502521348ccec57.zip
more linked id ui fine tuning
Diffstat (limited to 'OpenKeychain')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java2
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/linked_dns.pngbin8141 -> 667 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/linked_github.pngbin1464 -> 1437 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/linked_https.pngbin2526 -> 1345 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-hdpi/linked_twitter.pngbin1785 -> 1265 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/linked_dns.pngbin5238 -> 371 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/linked_github.pngbin1107 -> 999 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/linked_https.pngbin1836 -> 1010 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-mdpi/linked_twitter.pngbin1353 -> 880 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/linked_dns.pngbin14798 -> 736 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/linked_github.pngbin2376 -> 2153 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/linked_https.pngbin3620 -> 1955 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xhdpi/linked_twitter.pngbin2125 -> 1916 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/linked_dns.pngbin22410 -> 1498 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/linked_github.pngbin3404 -> 3179 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/linked_https.pngbin4811 -> 3222 bytes
-rw-r--r--OpenKeychain/src/main/res/drawable-xxhdpi/linked_twitter.pngbin2840 -> 2666 bytes
17 files changed, 2 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java
index aa99a2907..2efafc086 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdViewFragment.java
@@ -478,6 +478,7 @@ public class LinkedIdViewFragment extends Fragment implements
if (result.success()) {
mViewHolder.vText.setText(getString(mLinkedResource.getVerifiedText(mIsSecret)));
mViewHolder.setVerifyingState(mContext, VerifyState.VERIFY_OK, mIsSecret);
+
} else {
mViewHolder.setVerifyingState(mContext, VerifyState.VERIFY_ERROR, mIsSecret);
result.createNotify(getActivity()).show();
@@ -498,6 +499,7 @@ public class LinkedIdViewFragment extends Fragment implements
long certifyKeyId = mViewHolder.vKeySpinner.getSelectedItemId();
if (certifyKeyId == key.none || certifyKeyId == key.symmetric) {
Notify.create(getActivity(), R.string.select_key_to_certify, Style.ERROR).show();
+ return;
}
Passphrase passphrase;
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/linked_dns.png b/OpenKeychain/src/main/res/drawable-hdpi/linked_dns.png
index 898160fd1..41719efd6 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/linked_dns.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/linked_dns.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/linked_github.png b/OpenKeychain/src/main/res/drawable-hdpi/linked_github.png
index bba0729ff..2a1ae67d7 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/linked_github.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/linked_github.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/linked_https.png b/OpenKeychain/src/main/res/drawable-hdpi/linked_https.png
index 83585a890..278fac4f8 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/linked_https.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/linked_https.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/linked_twitter.png b/OpenKeychain/src/main/res/drawable-hdpi/linked_twitter.png
index f80f9cc07..dd0fce197 100644
--- a/OpenKeychain/src/main/res/drawable-hdpi/linked_twitter.png
+++ b/OpenKeychain/src/main/res/drawable-hdpi/linked_twitter.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/linked_dns.png b/OpenKeychain/src/main/res/drawable-mdpi/linked_dns.png
index 6dbbf6fd6..c6f3e9a06 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/linked_dns.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/linked_dns.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/linked_github.png b/OpenKeychain/src/main/res/drawable-mdpi/linked_github.png
index a2dd32029..ba3d2e4b7 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/linked_github.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/linked_github.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/linked_https.png b/OpenKeychain/src/main/res/drawable-mdpi/linked_https.png
index 6ffd0bef7..54b085aaf 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/linked_https.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/linked_https.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-mdpi/linked_twitter.png b/OpenKeychain/src/main/res/drawable-mdpi/linked_twitter.png
index 5b0ca3f40..86ca9d46e 100644
--- a/OpenKeychain/src/main/res/drawable-mdpi/linked_twitter.png
+++ b/OpenKeychain/src/main/res/drawable-mdpi/linked_twitter.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/linked_dns.png b/OpenKeychain/src/main/res/drawable-xhdpi/linked_dns.png
index 5056cb0b1..ec87cdd1c 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/linked_dns.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/linked_dns.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/linked_github.png b/OpenKeychain/src/main/res/drawable-xhdpi/linked_github.png
index b5a861ad1..0934f1840 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/linked_github.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/linked_github.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/linked_https.png b/OpenKeychain/src/main/res/drawable-xhdpi/linked_https.png
index 9973bfde2..f627d2b3b 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/linked_https.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/linked_https.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/linked_twitter.png b/OpenKeychain/src/main/res/drawable-xhdpi/linked_twitter.png
index 35e22cafe..35bb1fd3b 100644
--- a/OpenKeychain/src/main/res/drawable-xhdpi/linked_twitter.png
+++ b/OpenKeychain/src/main/res/drawable-xhdpi/linked_twitter.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/linked_dns.png b/OpenKeychain/src/main/res/drawable-xxhdpi/linked_dns.png
index f28ebc695..9b3ee8572 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/linked_dns.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/linked_dns.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/linked_github.png b/OpenKeychain/src/main/res/drawable-xxhdpi/linked_github.png
index 38d7a12f4..19a3421bf 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/linked_github.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/linked_github.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/linked_https.png b/OpenKeychain/src/main/res/drawable-xxhdpi/linked_https.png
index 25e1baf28..c41ab6c1c 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/linked_https.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/linked_https.png
Binary files differ
diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/linked_twitter.png b/OpenKeychain/src/main/res/drawable-xxhdpi/linked_twitter.png
index 62116fd34..0710a12f1 100644
--- a/OpenKeychain/src/main/res/drawable-xxhdpi/linked_twitter.png
+++ b/OpenKeychain/src/main/res/drawable-xxhdpi/linked_twitter.png
Binary files differ