arno/etesync-android
1
0
Fork 0
mirror of https://github.com/etesync/android synced 2025-01-11 08:10:58 +00:00
Code Issues Releases Wiki Activity

Import: verify activity is not null when finishing import.

Browse Source 
This is really just an ugly workaround for a crash. This whole thing needs to
be redone. It's currently quite broken when it comes to lifecycle handling and
a source for many issues.
This commit is contained in:
Tom Hacohen 2019-07-15 13:01:33 +01:00
parent 84ab0cb16f
commit cac34e6785
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/etesync/syncadapter/ui/importlocal/LocalCalendarImportFragment.kt
View File

@ -18,6 +18,7 @@ import at.bitfire.ical4android.CalendarStorageException
import com.etesync.syncadapter.Constants.KEY_ACCOUNT import com.etesync.syncadapter.Constants.KEY_ACCOUNT
import com.etesync.syncadapter.Constants.KEY_COLLECTION_INFO import com.etesync.syncadapter.Constants.KEY_COLLECTION_INFO
import com.etesync.syncadapter.R import com.etesync.syncadapter.R
import com.etesync.syncadapter.log.Logger
import com.etesync.syncadapter.model.CollectionInfo import com.etesync.syncadapter.model.CollectionInfo
import com.etesync.syncadapter.resource.LocalCalendar import com.etesync.syncadapter.resource.LocalCalendar
import com.etesync.syncadapter.resource.LocalEvent import com.etesync.syncadapter.resource.LocalEvent
@ -190,7 +191,13 @@ class LocalCalendarImportFragment : ListFragment() {
} }
override fun onPostExecute(result: ResultFragment.ImportResult) { override fun onPostExecute(result: ResultFragment.ImportResult) {
if (progressDialog.isShowing && !activity!!.isDestroyed) { val activity = activity
if (activity == null) {
Logger.log.warning("Activity is null on import.")
return
}
if (progressDialog.isShowing && !activity.isDestroyed) {
progressDialog.dismiss() progressDialog.dismiss()
} }
(activity as ResultFragment.OnImportCallback).onImportResult(result) (activity as ResultFragment.OnImportCallback).onImportResult(result)

9
app/src/main/java/com/etesync/syncadapter/ui/importlocal/LocalContactImportFragment.kt
View File

@ -24,6 +24,7 @@ import at.bitfire.vcard4android.ContactsStorageException
import com.etesync.syncadapter.Constants.KEY_ACCOUNT import com.etesync.syncadapter.Constants.KEY_ACCOUNT
import com.etesync.syncadapter.Constants.KEY_COLLECTION_INFO import com.etesync.syncadapter.Constants.KEY_COLLECTION_INFO
import com.etesync.syncadapter.R import com.etesync.syncadapter.R
import com.etesync.syncadapter.log.Logger
import com.etesync.syncadapter.model.CollectionInfo import com.etesync.syncadapter.model.CollectionInfo
import com.etesync.syncadapter.resource.LocalAddressBook import com.etesync.syncadapter.resource.LocalAddressBook
import com.etesync.syncadapter.resource.LocalContact import com.etesync.syncadapter.resource.LocalContact
@ -124,7 +125,13 @@ class LocalContactImportFragment : Fragment() {
} }
override fun onPostExecute(result: ResultFragment.ImportResult) { override fun onPostExecute(result: ResultFragment.ImportResult) {
if (progressDialog.isShowing && !activity!!.isDestroyed) { val activity = activity
if (activity == null) {
Logger.log.warning("Activity is null on import.")
return
}
if (progressDialog.isShowing && !activity.isDestroyed) {
progressDialog.dismiss() progressDialog.dismiss()
} }
(activity as ResultFragment.OnImportCallback).onImportResult(result) (activity as ResultFragment.OnImportCallback).onImportResult(result)