Merge branch 'hotfix/1.6.2'

iSoron · Oct 13, 2016 · 967dc25 · 967dc25
2 parents 4624acd + 908fd1d
commit 967dc25
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -21,8 +21,8 @@
 <manifest
     package="org.isoron.uhabits"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:versionCode="24"
-    android:versionName="1.6.1">
+    android:versionCode="25"
+    android:versionName="1.6.2">
 
     <uses-permission android:name="android.permission.VIBRATE"/>
 

diff --git a/app/src/main/java/org/isoron/uhabits/utils/DateFormats.java b/app/src/main/java/org/isoron/uhabits/utils/DateFormats.java
@@ -44,7 +44,7 @@ public static SimpleDateFormat fromSkeleton(@NonNull String skeleton)
     {
         Locale locale = Locale.getDefault();
 
-        if (SDK_INT >= JELLY_BEAN)
+        if (SDK_INT >= JELLY_BEAN_MR2)
             skeleton = getBestDateTimePattern(locale, skeleton);
 
         return fromSkeleton(skeleton, locale);