diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-11 17:12:07 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-06-11 17:12:07 +0200 |
commit | baea31847022ce88906a0190638ddffed82c8a7c (patch) | |
tree | cdd080f224a82a377295a02f64f62fb7534012cb /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java | |
parent | c8790f404aaf76db967a16c8fea79eb6f90c8bce (diff) | |
parent | 98ba424576946d2f5ef529c5506113b71b0266c4 (diff) | |
download | open-keychain-baea31847022ce88906a0190638ddffed82c8a7c.tar.gz open-keychain-baea31847022ce88906a0190638ddffed82c8a7c.tar.bz2 open-keychain-baea31847022ce88906a0190638ddffed82c8a7c.zip |
Merge remote-tracking branch 'origin/master' into v/multi-decrypt
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java index 710dbf8aa..98f19e98f 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java @@ -128,8 +128,6 @@ public class KeychainApplication extends Application { /** * Add OpenKeychain account to Android to link contacts with keys - * - * @param context */ public static void setupAccountAsNeeded(Context context) { try { @@ -165,7 +163,7 @@ public class KeychainApplication extends Application { int edgeDrawableId = context.getResources().getIdentifier("overscroll_edge", "drawable", "android"); Drawable androidEdge = context.getResources().getDrawable(edgeDrawableId); androidEdge.setColorFilter(brandColor, PorterDuff.Mode.SRC_IN); - } catch (Resources.NotFoundException e) { + } catch (Exception ignored) { } } } |