From: David A. Velasco <dvelasco@owncloud.com>
Date: Wed, 5 Nov 2014 08:09:48 +0000 (+0100)
Subject: Merge pull request #706 from owncloud/christmas_app
X-Git-Tag: oc-android-1.7.0_signed~118
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/80cfc55fda1f71124e2a658b46229cbb7c1feb77?hp=eb77fe1da17c6d773fe60a561e6785f0c2bdab4f

Merge pull request #706 from owncloud/christmas_app

Winter holidays fix
---

diff --git a/src/com/owncloud/android/utils/DisplayUtils.java b/src/com/owncloud/android/utils/DisplayUtils.java
index 8c4c492b..804a4dd0 100644
--- a/src/com/owncloud/android/utils/DisplayUtils.java
+++ b/src/com/owncloud/android/utils/DisplayUtils.java
@@ -29,6 +29,7 @@ import java.util.Set;
 import android.annotation.TargetApi;
 import android.os.Build;
 
+import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 
 /**
@@ -39,6 +40,8 @@ import com.owncloud.android.R;
  */
 public class DisplayUtils {
     
+    private static final String OWNCLOUD_APP_NAME = "ownCloud";
+
     //private static String TAG = DisplayUtils.class.getSimpleName(); 
     
     private static final String[] sizeSuffixes = { "B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB" };
@@ -233,7 +236,8 @@ public class DisplayUtils {
     
     
     public static int getSeasonalIconId() {
-        if (Calendar.getInstance().get(Calendar.DAY_OF_YEAR) >= 354) {
+        if (Calendar.getInstance().get(Calendar.DAY_OF_YEAR) >= 354 &&
+                MainApp.getAppContext().getString(R.string.app_name).equals(OWNCLOUD_APP_NAME)) {
             return R.drawable.winter_holidays_icon;
         } else {
             return R.drawable.icon;