Update getSeasonalId method on DisplayUtils class for not changing the app icon on...

diff --git a/src/com/owncloud/android/utils/DisplayUtils.java b/src/com/owncloud/android/utils/DisplayUtils.java
index 8c4c492..804a4dd 100644 (file)
--- 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;\r
 import android.os.Build;\r
 \r
 import android.annotation.TargetApi;\r
 import android.os.Build;\r
 \r

+import com.owncloud.android.MainApp;\r

 import com.owncloud.android.R;\r
 \r
 /**\r
 import com.owncloud.android.R;\r
 \r
 /**\r


@@ -39,6 +40,8 @@ import com.owncloud.android.R;
  */\r
 public class DisplayUtils {\r
     \r
  */\r
 public class DisplayUtils {\r
     \r

+    private static final String OWNCLOUD_APP_NAME = "ownCloud";\r
+\r

     //private static String TAG = DisplayUtils.class.getSimpleName(); \r
     \r
     private static final String[] sizeSuffixes = { "B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB" };\r
     //private static String TAG = DisplayUtils.class.getSimpleName(); \r
     \r
     private static final String[] sizeSuffixes = { "B", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB" };\r


@@ -233,7 +236,8 @@ public class DisplayUtils {
     \r
     \r
     public static int getSeasonalIconId() {\r
     \r
     \r
     public static int getSeasonalIconId() {\r

-        if (Calendar.getInstance().get(Calendar.DAY_OF_YEAR) >= 354) {\r
+        if (Calendar.getInstance().get(Calendar.DAY_OF_YEAR) >= 354 &&\r
+                MainApp.getAppContext().getString(R.string.app_name).equals(OWNCLOUD_APP_NAME)) {\r

             return R.drawable.winter_holidays_icon;\r
         } else {\r
             return R.drawable.icon;\r
             return R.drawable.winter_holidays_icon;\r
         } else {\r
             return R.drawable.icon;\r