Merge branch 'dev' into feature/custom-snooze

build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-beta6'
+        classpath 'com.android.tools.build:gradle:3.0.0'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.4'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'

gradle.properties

@@ -6,7 +6,7 @@ TARGET_SDK_VERSION = 25
 COMPILE_SDK_VERSION = 25
 
 DAGGER_VERSION = 2.9
-BUILD_TOOLS_VERSION = 26.0.0
+BUILD_TOOLS_VERSION = 26.0.2
 KOTLIN_VERSION = 1.1.2-4
 SUPPORT_LIBRARY_VERSION = 25.3.1
 

uhabits-android/src/main/java/org/isoron/uhabits/intents/PendingIntentFactory.kt

@@ -54,6 +54,15 @@ class PendingIntentFactory
                     },
                     FLAG_UPDATE_CURRENT)
 
+    fun removeRepetition(habit: Habit): PendingIntent =
+            PendingIntent.getBroadcast(
+                    context, 3,
+                    Intent(context, WidgetReceiver::class.java).apply {
+                        action = WidgetReceiver.ACTION_REMOVE_REPETITION
+                        data = Uri.parse(habit.uriString)
+                    },
+                    FLAG_UPDATE_CURRENT)
+
     fun showHabit(habit: Habit): PendingIntent =
             android.support.v4.app.TaskStackBuilder
                     .create(context)

uhabits-android/src/main/java/org/isoron/uhabits/notifications/AndroidNotificationTray.kt

@@ -23,6 +23,7 @@ import android.app.*
 import android.content.*
 import android.graphics.*
 import android.graphics.BitmapFactory.*
+import android.support.annotation.*
 import android.support.v4.app.*
 import android.support.v4.app.NotificationCompat.*
 import org.isoron.androidbase.*
@@ -50,11 +51,24 @@ class AndroidNotificationTray
     override fun showNotification(habit: Habit,
                                   notificationId: Int,
                                   timestamp: Timestamp,
-                                  reminderTime: Long) {
+                                  reminderTime: Long)
+    {
+        val notificationManager = NotificationManagerCompat.from(context)
+        val summary = buildSummary(reminderTime)
+        notificationManager.notify(Int.MAX_VALUE, summary)
+        val notification = buildNotification(habit, reminderTime, timestamp)
+        notificationManager.notify(notificationId, notification)
+    }
+
+    @NonNull
+    fun buildNotification(@NonNull habit: Habit,
+                          @NonNull reminderTime: Long,
+                          @NonNull timestamp: Timestamp) : Notification
+    {
 
-        val checkAction = Action(
+        val addRepetitionAction = Action(
                 R.drawable.ic_action_check,
-                context.getString(R.string.check),
+                context.getString(R.string.yes),
                 pendingIntents.addCheckmark(habit, timestamp))
 
         val snoozeAction = Action(
@@ -62,6 +76,12 @@ class AndroidNotificationTray
                 context.getString(R.string.snooze),
                 pendingIntents.snoozeNotification(habit))
 
+        val removeRepetitionAction = Action(
+                R.drawable.ic_action_cancel,
+                context.getString(R.string.no),
+                pendingIntents.removeRepetition(habit)
+        )
+
         val wearableBg = decodeResource(context.resources, R.drawable.stripe)
 
         // Even though the set of actions is the same on the phone and
@@ -69,7 +89,8 @@ class AndroidNotificationTray
         // WearableExtender.
         val wearableExtender = WearableExtender()
                 .setBackground(wearableBg)
-                .addAction(checkAction)
+                .addAction(addRepetitionAction)
+                .addAction(removeRepetitionAction)
                 .addAction(snoozeAction)
 
         val builder = NotificationCompat.Builder(context)
@@ -78,20 +99,32 @@ class AndroidNotificationTray
                 .setContentText(habit.description)
                 .setContentIntent(pendingIntents.showHabit(habit))
                 .setDeleteIntent(pendingIntents.dismissNotification(habit))
-                .addAction(checkAction)
+                .addAction(addRepetitionAction)
+                .addAction(removeRepetitionAction)
                 .addAction(snoozeAction)
                 .setSound(ringtoneManager.getURI())
                 .extend(wearableExtender)
                 .setWhen(reminderTime)
                 .setShowWhen(true)
                 .setOngoing(preferences.shouldMakeNotificationsSticky())
+		        .setGroup("default")
 
         if (preferences.shouldMakeNotificationsLed())
             builder.setLights(Color.RED, 1000, 1000)
 
-        val notificationManager = context.getSystemService(
+	return builder.build()
-                Activity.NOTIFICATION_SERVICE) as NotificationManager
+    }
 
-        notificationManager.notify(notificationId, builder.build())
+    @NonNull
+    private fun buildSummary(@NonNull reminderTime: Long) : Notification
+    {
+        return NotificationCompat.Builder(context)
+                .setSmallIcon(R.drawable.ic_notification)
+                .setContentTitle(context.getString(R.string.app_name))
+                .setWhen(reminderTime)
+                .setShowWhen(true)
+                .setGroup("default")
+                .setGroupSummary(true)
+                .build()
     }
 }

uhabits-android/src/main/res/values/strings.xml

@@ -220,4 +220,6 @@
     <string name="example_question_boolean">e.g. Did you exercise today?</string>
     <string name="question">Question</string>
     <string name="target">Target</string>
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
 </resources>

uhabits-core/src/main/java/org/isoron/uhabits/core/models/memory/MemoryHabitList.java

@@ -155,14 +155,14 @@ public class MemoryHabitList extends HabitList
     }
 
     @Override
-    public int indexOf(@NonNull Habit h)
+    public synchronized int indexOf(@NonNull Habit h)
     {
         return list.indexOf(h);
     }
 
     @NonNull
     @Override
-    public Iterator<Habit> iterator()
+    public synchronized Iterator<Habit> iterator()
     {
         return Collections.unmodifiableCollection(list).iterator();
     }
@@ -200,13 +200,13 @@ public class MemoryHabitList extends HabitList
     }
 
     @Override
-    public int size()
+    public synchronized int size()
     {
         return list.size();
     }
 
     @Override
-    public void update(List<Habit> habits)
+    public synchronized void update(List<Habit> habits)
     {
         resort();
         getObservable().notifyListeners();

uhabits-core/src/main/java/org/isoron/uhabits/core/models/sqlite/SQLiteHabitList.java

@@ -91,7 +91,7 @@ public class SQLiteHabitList extends HabitList
 
     @Override
     @Nullable
-    public Habit getById(long id)
+    public synchronized Habit getById(long id)
     {
         loadRecords();
         return list.getById(id);
@@ -99,7 +99,7 @@ public class SQLiteHabitList extends HabitList
 
     @Override
     @NonNull
-    public Habit getByPosition(int position)
+    public synchronized Habit getByPosition(int position)
     {
         loadRecords();
         return list.getByPosition(position);
@@ -107,7 +107,7 @@ public class SQLiteHabitList extends HabitList
 
     @NonNull
     @Override
-    public HabitList getFiltered(HabitMatcher filter)
+    public synchronized HabitList getFiltered(HabitMatcher filter)
     {
         loadRecords();
         return list.getFiltered(filter);
@@ -121,21 +121,21 @@ public class SQLiteHabitList extends HabitList
     }
 
     @Override
-    public void setOrder(@NonNull Order order)
+    public synchronized void setOrder(@NonNull Order order)
     {
         list.setOrder(order);
         getObservable().notifyListeners();
     }
 
     @Override
-    public int indexOf(@NonNull Habit h)
+    public synchronized int indexOf(@NonNull Habit h)
     {
         loadRecords();
         return list.indexOf(h);
     }
 
     @Override
-    public Iterator<Habit> iterator()
+    public synchronized Iterator<Habit> iterator()
     {
         loadRecords();
         return list.iterator();
@@ -214,7 +214,7 @@ public class SQLiteHabitList extends HabitList
     }
 
     @Override
-    public void repair()
+    public synchronized void repair()
     {
         loadRecords();
         rebuildOrder();
@@ -222,7 +222,7 @@ public class SQLiteHabitList extends HabitList
     }
 
     @Override
-    public int size()
+    public synchronized int size()
     {
         loadRecords();
         return list.size();
@@ -245,7 +245,7 @@ public class SQLiteHabitList extends HabitList
         getObservable().notifyListeners();
     }
 
-    public void reload()
+    public synchronized void reload()
     {
         loaded = false;
     }

uhabits-core/src/main/java/org/isoron/uhabits/core/ui/widgets/WidgetBehavior.java

@@ -48,14 +48,15 @@ public class WidgetBehavior
 
     public void onAddRepetition(@NonNull Habit habit, Timestamp timestamp)
     {
+        notificationTray.cancel(habit);
         Repetition rep = habit.getRepetitions().getByTimestamp(timestamp);
         if (rep != null) return;
         performToggle(habit, timestamp);
-        notificationTray.cancel(habit);
     }
 
     public void onRemoveRepetition(@NonNull Habit habit, Timestamp timestamp)
     {
+        notificationTray.cancel(habit);
         Repetition rep = habit.getRepetitions().getByTimestamp(timestamp);
         if (rep == null) return;
         performToggle(habit, timestamp);