Merge branch 'hotfix/1.7.2'

iSoron · May 28, 2017 · 5e00d07 · 5e00d07
2 parents fa416ad + 28b6ae7
commit 5e00d07
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+### 1.7.2 (May 27, 2017)
+
+* Fix crash at startup
+
 ### 1.7.1 (May 21, 2017)
 
 * Fix crash (BadParcelableException)

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="28"
-    android:versionName="1.7.1">
+    android:versionCode="29"
+    android:versionName="1.7.2">
 
     <uses-permission android:name="android.permission.VIBRATE"/>
 

diff --git a/app/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.java b/app/src/main/java/org/isoron/uhabits/activities/common/views/BundleSavedState.java
@@ -29,7 +29,7 @@ public class BundleSavedState extends android.support.v4.view.AbsSavedState
             @Override
             public BundleSavedState createFromParcel(Parcel source)
             {
-                return new BundleSavedState(source);
+                return new BundleSavedState(source, getClass().getClassLoader());
             }
 
             @Override
@@ -47,9 +47,9 @@ public BundleSavedState(Parcelable superState, Bundle bundle)
         this.bundle = bundle;
     }
 
-    public BundleSavedState(Parcel source)
+    public BundleSavedState(Parcel source, ClassLoader loader)
     {
-        super(source);
+        super(source, loader);
         this.bundle = source.readBundle(getClass().getClassLoader());
     }
 

diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/edit/BaseDialog.java b/app/src/main/java/org/isoron/uhabits/activities/habits/edit/BaseDialog.java
@@ -39,6 +39,8 @@
 
 import butterknife.*;
 
+import static org.isoron.uhabits.activities.ThemeSwitcher.*;
+
 public abstract class BaseDialog extends AppCompatDialogFragment
 {
     @Nullable
@@ -65,7 +67,13 @@ public abstract class BaseDialog extends AppCompatDialogFragment
     @Override
     public int getTheme()
     {
-        return R.style.DialogWithTitle;
+        AppComponent component =
+            ((HabitsApplication) getContext().getApplicationContext()).getComponent();
+
+        if(component.getPreferences().getTheme() == THEME_LIGHT)
+            return R.style.DialogWithTitle;
+        else
+            return R.style.DarkDialogWithTitle;
     }
 
     @Override

diff --git a/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java b/app/src/main/java/org/isoron/uhabits/models/sqlite/SQLiteHabitList.java
@@ -261,7 +261,7 @@ public void update(List<Habit> habits)
         }
     }
 
-    protected List<Habit> toList()
+    protected synchronized List<Habit> toList()
     {
         String query = buildSelectQuery();
         List<HabitRecord> recordList = sqlite.query(query, null);

diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
@@ -158,7 +158,7 @@
   <string name="reminder_sound">Zvuk podsjetnika</string>
   <string name="none">Nijedan</string>
   <string name="filter">Filtar</string>
-  <string name="hide_completed">Skrivanje je uspjelo</string>
+  <string name="hide_completed">Sakrij završeno</string>
   <string name="hide_archived">Sakrij arhivirano</string>
   <string name="sticky_notifications">Učini obavijesti trajnima</string>
   <string name="sticky_notifications_description">Spriječava da se obavijesti zanemare.</string>

diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
@@ -75,7 +75,7 @@
   <string name="interval_4_hour">4 שעות</string>
   <string name="interval_8_hour">8 שעות</string>
   <string name="interval_24_hour">24 שעות</string>
-  <string name="pref_toggle_title">החלפה להפעלה עם לחיצה קצרה</string>
+  <string name="pref_toggle_title">סימון הרגלים בלחיצה קצרה</string>
   <string name="pref_toggle_description">סמנו יעדים בהקשה קצרה במקום לחיצה ממושכת. נוח יותר, אך יכול להוביל ללחיצות לא מכוונות.</string>
   <string name="pref_snooze_interval_title">מרווח נדנוד לתזכורות</string>
   <string name="pref_rate_this_app">דרג/י אותנו ב- Google Play</string>
@@ -107,7 +107,7 @@
   <string name="developers">מפתחים</string>
   <string name="version_n">גרסה %s</string>
   <string name="frequency">תדירות</string>
-  <string name="checkmark">סימן</string>
+  <string name="checkmark">סימון הרגל</string>
   <string name="strength">חוזק</string>
   <string name="best_streaks">רצף שיא</string>
   <string name="current_streaks">רצף נוכחי</string>

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -260,4 +260,9 @@
     <style name="DialogWithTitle" parent="@style/Theme.AppCompat.Light.Dialog">
         <item name="windowNoTitle">false</item>
     </style>
+
+    <style name="DarkDialogWithTitle"
+           parent="@style/Theme.AppCompat.Dialog">
+        <item name="windowNoTitle">false</item>
+    </style>
 </resources>