Skip to content

Commit a6dc7ae

Browse files
committed
fix #80, prevent crashes at rotating with some dialog open
1 parent d6b4fbd commit a6dc7ae

File tree

2 files changed

+14
-2
lines changed

2 files changed

+14
-2
lines changed

app/src/main/kotlin/com/simplemobiletools/notes/activities/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class MainActivity : SimpleActivity(), ViewPager.OnPageChangeListener {
5959

6060
val itemIndex = getNoteIndexWithId(wantedNoteId)
6161

62-
mAdapter = NotesPagerAdapter(supportFragmentManager, mNotes)
62+
mAdapter = NotesPagerAdapter(supportFragmentManager, mNotes, applicationContext)
6363
view_pager.apply {
6464
adapter = mAdapter
6565
currentItem = itemIndex

app/src/main/kotlin/com/simplemobiletools/notes/adapters/NotesPagerAdapter.kt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
package com.simplemobiletools.notes.adapters
22

3+
import android.content.Context
34
import android.os.Bundle
45
import android.support.v4.app.Fragment
56
import android.support.v4.app.FragmentManager
67
import android.support.v4.app.FragmentStatePagerAdapter
78
import android.util.SparseArray
9+
import android.view.ViewGroup
10+
import com.simplemobiletools.commons.extensions.toast
11+
import com.simplemobiletools.notes.R
812
import com.simplemobiletools.notes.fragments.NoteFragment
913
import com.simplemobiletools.notes.helpers.NOTE_ID
1014
import com.simplemobiletools.notes.models.Note
1115

12-
class NotesPagerAdapter(fm: FragmentManager, private val notes: List<Note>) : FragmentStatePagerAdapter(fm) {
16+
class NotesPagerAdapter(fm: FragmentManager, val notes: List<Note>, val context: Context) : FragmentStatePagerAdapter(fm) {
1317
var fragments: SparseArray<NoteFragment> = SparseArray(5)
1418

1519
override fun getCount() = notes.size
@@ -35,4 +39,12 @@ class NotesPagerAdapter(fm: FragmentManager, private val notes: List<Note>) : Fr
3539
fun saveCurrentNote(position: Int) = fragments[position]?.saveText()
3640

3741
fun showKeyboard(position: Int) = fragments[position]?.showKeyboard()
42+
43+
override fun finishUpdate(container: ViewGroup?) {
44+
try {
45+
super.finishUpdate(container)
46+
} catch (e: Exception) {
47+
context.toast(R.string.unknown_error_occurred)
48+
}
49+
}
3850
}

0 commit comments

Comments
 (0)