Skip to content
Snippets Groups Projects
Verified Commit 3b878e73 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Fixed issue where connecting to a disconnected network isn’t possible

parent 74d219ae
Branches
Tags
No related merge requests found
...@@ -133,8 +133,7 @@ class BufferViewConfigFragment : ServiceBoundFragment() { ...@@ -133,8 +133,7 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
val network = session?.networks?.get(networkId) val network = session?.networks?.get(networkId)
val bufferViewConfig = modelHelper.bufferViewConfig.value?.orNull() val bufferViewConfig = modelHelper.bufferViewConfig.value?.orNull()
return if (info != null) { return BufferContextPresenter.handleAction(
BufferContextPresenter.handleAction(
requireContext(), requireContext(),
mode, mode,
item, item,
...@@ -144,9 +143,6 @@ class BufferViewConfigFragment : ServiceBoundFragment() { ...@@ -144,9 +143,6 @@ class BufferViewConfigFragment : ServiceBoundFragment() {
bufferViewConfig, bufferViewConfig,
network network
) )
} else {
false
}
} }
override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean { override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean {
......
...@@ -111,9 +111,9 @@ object BufferContextPresenter { ...@@ -111,9 +111,9 @@ object BufferContextPresenter {
context: Context, context: Context,
actionMode: ActionMode, actionMode: ActionMode,
item: MenuItem, item: MenuItem,
info: BufferInfo, info: BufferInfo?,
session: ISession, session: ISession?,
bufferSyncer: BufferSyncer, bufferSyncer: BufferSyncer?,
bufferViewConfig: BufferViewConfig?, bufferViewConfig: BufferViewConfig?,
network: Network? network: Network?
) = when (item.itemId) { ) = when (item.itemId) {
...@@ -142,16 +142,25 @@ object BufferContextPresenter { ...@@ -142,16 +142,25 @@ object BufferContextPresenter {
true true
} }
R.id.action_join -> { R.id.action_join -> {
session.rpcHandler.sendInput(info, "/join ${info.bufferName}") if (info != null) {
session?.rpcHandler?.sendInput(info, "/join ${info.bufferName}")
actionMode.finish() actionMode.finish()
true true
} else {
false
}
} }
R.id.action_part -> { R.id.action_part -> {
session.rpcHandler.sendInput(info, "/part ${info.bufferName}") if (info != null) {
session?.rpcHandler?.sendInput(info, "/part ${info.bufferName}")
actionMode.finish() actionMode.finish()
true true
} else {
false
}
} }
R.id.action_delete -> { R.id.action_delete -> {
if (info != null) {
MaterialDialog.Builder(context) MaterialDialog.Builder(context)
.content(R.string.buffer_delete_confirmation) .content(R.string.buffer_delete_confirmation)
.positiveText(R.string.label_yes) .positiveText(R.string.label_yes)
...@@ -160,7 +169,7 @@ object BufferContextPresenter { ...@@ -160,7 +169,7 @@ object BufferContextPresenter {
.backgroundColorAttr(R.attr.colorBackgroundCard) .backgroundColorAttr(R.attr.colorBackgroundCard)
.contentColorAttr(R.attr.colorTextPrimary) .contentColorAttr(R.attr.colorTextPrimary)
.onPositive { _, _ -> .onPositive { _, _ ->
session.bufferSyncer.requestRemoveBuffer(info.bufferId) session?.bufferSyncer?.requestRemoveBuffer(info.bufferId)
} }
.onAny { _, _ -> .onAny { _, _ ->
actionMode.finish() actionMode.finish()
...@@ -168,15 +177,19 @@ object BufferContextPresenter { ...@@ -168,15 +177,19 @@ object BufferContextPresenter {
.build() .build()
.show() .show()
true true
} else {
false
}
} }
R.id.action_rename -> { R.id.action_rename -> {
if (info != null && bufferSyncer != null) {
MaterialDialog.Builder(context) MaterialDialog.Builder(context)
.input( .input(
context.getString(R.string.label_buffer_name), context.getString(R.string.label_buffer_name),
info.bufferName, info.bufferName,
false false
) { _, input -> ) { _, input ->
session.bufferSyncer.requestRenameBuffer(info.bufferId, input.toString()) session?.bufferSyncer?.requestRenameBuffer(info.bufferId, input.toString())
} }
.positiveText(R.string.label_save) .positiveText(R.string.label_save)
.negativeText(R.string.label_cancel) .negativeText(R.string.label_cancel)
...@@ -189,13 +202,21 @@ object BufferContextPresenter { ...@@ -189,13 +202,21 @@ object BufferContextPresenter {
.build() .build()
.show() .show()
true true
} else {
false
}
} }
R.id.action_unhide -> { R.id.action_unhide -> {
if (info != null && bufferSyncer != null) {
bufferViewConfig?.insertBufferSorted(info, bufferSyncer) bufferViewConfig?.insertBufferSorted(info, bufferSyncer)
actionMode.finish() actionMode.finish()
true true
} else {
false
}
} }
R.id.action_archive -> { R.id.action_archive -> {
if (info != null) {
MaterialDialog.Builder(context) MaterialDialog.Builder(context)
.title(R.string.label_archive_chat) .title(R.string.label_archive_chat)
.content(R.string.buffer_archive_confirmation) .content(R.string.buffer_archive_confirmation)
...@@ -218,6 +239,9 @@ object BufferContextPresenter { ...@@ -218,6 +239,9 @@ object BufferContextPresenter {
.build() .build()
.show() .show()
true true
} else {
false
}
} }
else -> false else -> false
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment