From 72f71b915892eab02455c164eb497d70937602a0 Mon Sep 17 00:00:00 2001 From: tibbi Date: Sun, 31 Dec 2017 12:20:17 +0100 Subject: [PATCH] update Commons with joda proguard rules --- app/build.gradle | 2 +- app/proguard-rules.pro | 6 ------ .../simplemobiletools/calendar/adapters/DayEventsAdapter.kt | 3 +-- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 945851f8b..46c3ddf7e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -42,7 +42,7 @@ ext { } dependencies { - implementation 'com.simplemobiletools:commons:3.4.12' + implementation 'com.simplemobiletools:commons:3.5.4' implementation 'joda-time:joda-time:2.9.9' implementation 'com.facebook.stetho:stetho:1.5.0' implementation 'com.android.support:multidex:1.0.2' diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 31a130621..ad7d60487 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -1,7 +1 @@ -keep class com.simplemobiletools.calendar.models.** { *; } - -# Joda --dontwarn org.joda.convert.** --dontwarn org.joda.time.** --keep class org.joda.time.** { *; } --keep interface org.joda.time.** { *; } diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt index e8480eacd..206e6da7a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/adapters/DayEventsAdapter.kt @@ -107,8 +107,7 @@ class DayEventsAdapter(activity: SimpleActivity, val events: ArrayList, v DeleteEventDialog(activity, eventIds) { val eventsToDelete = ArrayList(selectedPositions.size) selectedPositions.sortedDescending().forEach { - val event = events[it] - eventsToDelete.add(event) + eventsToDelete.add(events[it]) } events.removeAll(eventsToDelete)