|
|
@ -180,6 +180,7 @@ class MainActivity : InjectingAppCompatActivity(), TaskListFragmentCallbackHandl
|
|
|
|
val loadFilter = intent.getFilterString
|
|
|
|
val loadFilter = intent.getFilterString
|
|
|
|
val openTask = !intent.isFromHistory
|
|
|
|
val openTask = !intent.isFromHistory
|
|
|
|
&& (intent.hasExtra(OPEN_TASK) || intent.hasExtra(CREATE_TASK))
|
|
|
|
&& (intent.hasExtra(OPEN_TASK) || intent.hasExtra(CREATE_TASK))
|
|
|
|
|
|
|
|
val tef = taskEditFragment
|
|
|
|
Timber.d("""
|
|
|
|
Timber.d("""
|
|
|
|
|
|
|
|
|
|
|
|
**********
|
|
|
|
**********
|
|
|
@ -194,7 +195,7 @@ class MainActivity : InjectingAppCompatActivity(), TaskListFragmentCallbackHandl
|
|
|
|
taskEditFragment: ${taskEditFragment?.editViewModel?.task}
|
|
|
|
taskEditFragment: ${taskEditFragment?.editViewModel?.task}
|
|
|
|
**********""")
|
|
|
|
**********""")
|
|
|
|
if (!openTask && (openFilter != null || !loadFilter.isNullOrBlank())) {
|
|
|
|
if (!openTask && (openFilter != null || !loadFilter.isNullOrBlank())) {
|
|
|
|
taskEditFragment?.let {
|
|
|
|
tef?.let {
|
|
|
|
lifecycleScope.launch {
|
|
|
|
lifecycleScope.launch {
|
|
|
|
it.save()
|
|
|
|
it.save()
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -241,8 +242,7 @@ class MainActivity : InjectingAppCompatActivity(), TaskListFragmentCallbackHandl
|
|
|
|
existing
|
|
|
|
existing
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (isSinglePaneLayout) {
|
|
|
|
if (isSinglePaneLayout) {
|
|
|
|
if (openTask) {
|
|
|
|
if (openTask || tef != null) {
|
|
|
|
setFilter(null)
|
|
|
|
|
|
|
|
openTask(null)
|
|
|
|
openTask(null)
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
openTaskListFragment(filter, false)
|
|
|
|
openTaskListFragment(filter, false)
|
|
|
|