bitmessage/Abit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor fixes and improvements

Browse Source
This commit is contained in:
Christian Basler
2017-09-22 20:29:23 +02:00
parent c1d74e4781
commit f27f438998
11 changed files with 51 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/ch/dissem/apps/abit/MainActivity.kt
View File

@@ -29,7 +29,6 @@ import ch.dissem.apps.abit.drawer.ProfileImageListener
import ch.dissem.apps.abit.drawer.ProfileSelectionListener
import ch.dissem.apps.abit.listener.ListSelectionListener
import ch.dissem.apps.abit.repository.AndroidMessageRepository.Companion.LABEL_ARCHIVE
import ch.dissem.apps.abit.service.BitmessageService.Companion.isRunning
import ch.dissem.apps.abit.service.Singleton
import ch.dissem.apps.abit.synchronization.SyncAdapter
import ch.dissem.apps.abit.util.Labels
@@ -99,8 +98,8 @@ class MainActivity : AppCompatActivity(), ListSelectionListener<Serializable> {
private lateinit var drawer: Drawer
private lateinit var nodeSwitch: SwitchDrawerItem
val floatingActionButton: FabSpeedDial
get() = fab
val floatingActionButton: FabSpeedDial?
get() = findViewById(R.id.fab) as FabSpeedDial?
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -359,11 +358,12 @@ class MainActivity : AppCompatActivity(), ListSelectionListener<Serializable> {
}
override fun onRestoreInstanceState(savedInstanceState: Bundle) {
selectedLabel = savedInstanceState.getSerializable("selectedLabel") as Label
selectedLabel = savedInstanceState.getSerializable("selectedLabel") as Label?
val selectedItem = drawer.getDrawerItem(selectedLabel)
if (selectedItem != null) {
drawer.setSelection(selectedItem)
selectedLabel?.let { selectedLabel ->
drawer.getDrawerItem(selectedLabel)?.let { selectedItem ->
drawer.setSelection(selectedItem)
}
}
super.onRestoreInstanceState(savedInstanceState)
}