From fbd37d497783a99ce1efef141679f150f4684a47 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 22 Jan 2018 22:00:30 +0100 Subject: [PATCH] avoid trying to refresh viewpager from wrong thread, or with invalid activity --- .../simplemobiletools/calendar/activities/MainActivity.kt | 6 +++++- .../calendar/fragments/MyFragmentHolder.kt | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt index f69693e5e..3ef2a1151 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/activities/MainActivity.kt @@ -557,7 +557,11 @@ class MainActivity : SimpleActivity(), RefreshRecyclerViewListener { } private fun refreshViewPager() { - currentFragments.last().refreshEvents() + if (!isActivityDestroyed()) { + runOnUiThread { + currentFragments.last().refreshEvents() + } + } } private fun tryImportEvents() { diff --git a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MyFragmentHolder.kt b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MyFragmentHolder.kt index 0773d099f..f8c477db7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MyFragmentHolder.kt +++ b/app/src/main/kotlin/com/simplemobiletools/calendar/fragments/MyFragmentHolder.kt @@ -1,7 +1,6 @@ package com.simplemobiletools.calendar.fragments import android.support.v4.app.Fragment -import org.joda.time.DateTime abstract class MyFragmentHolder : Fragment() { abstract fun goToToday()