Cleanup of contact sync, debugging

1 files changed, 16 insertions, 14 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
index 01f6735ea..a4dc12a37 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
@@ -140,20 +140,22 @@ public class KeychainApplication extends Application {
     }
 
     static void brandGlowEffect(Context context, int brandColor) {
-        try {
-            // terrible hack to brand the edge overscroll glow effect
-            // https://gist.github.com/menny/7878762#file-brandgloweffect_full-java
-
-            //glow
-            int glowDrawableId = context.getResources().getIdentifier("overscroll_glow", "drawable", "android");
-            Drawable androidGlow = context.getResources().getDrawable(glowDrawableId);
-            androidGlow.setColorFilter(brandColor, PorterDuff.Mode.SRC_IN);
-            //edge
-            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) {
-            // no hack on Android 5
+        // no hack on Android 5
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
+            try {
+                // terrible hack to brand the edge overscroll glow effect
+                // https://gist.github.com/menny/7878762#file-brandgloweffect_full-java
+
+                //glow
+                int glowDrawableId = context.getResources().getIdentifier("overscroll_glow", "drawable", "android");
+                Drawable androidGlow = context.getResources().getDrawable(glowDrawableId);
+                androidGlow.setColorFilter(brandColor, PorterDuff.Mode.SRC_IN);
+                //edge
+                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) {
+            }
         }
     }
 }