Commit 7e9652ed authored by Mygod's avatar Mygod

Fix handling of missing plugin

parent 33cf7fe9
...@@ -131,7 +131,7 @@ class ProfileConfigFragment : PreferenceFragmentCompat(), ...@@ -131,7 +131,7 @@ class ProfileConfigFragment : PreferenceFragmentCompat(),
private fun initPlugins() { private fun initPlugins() {
plugin.value = pluginConfiguration.selected plugin.value = pluginConfiguration.selected
plugin.init() plugin.init()
pluginConfigure.isEnabled = pluginConfiguration.selected.isNotEmpty() pluginConfigure.isEnabled = plugin.selectedEntry?.let { it is NoPlugin } == false
pluginConfigure.text = pluginConfiguration.getOptions().toString() pluginConfigure.text = pluginConfiguration.getOptions().toString()
} }
...@@ -192,8 +192,7 @@ class ProfileConfigFragment : PreferenceFragmentCompat(), ...@@ -192,8 +192,7 @@ class ProfileConfigFragment : PreferenceFragmentCompat(),
setTargetFragment(this@ProfileConfigFragment, REQUEST_PICK_PLUGIN) setTargetFragment(this@ProfileConfigFragment, REQUEST_PICK_PLUGIN)
}.showAllowingStateLoss(parentFragmentManager, Key.plugin) }.showAllowingStateLoss(parentFragmentManager, Key.plugin)
Key.pluginConfigure -> { Key.pluginConfigure -> {
val intent = PluginManager.buildIntent(plugin.plugins.lookup.getValue(pluginConfiguration.selected).id, val intent = PluginManager.buildIntent(plugin.selectedEntry!!.id, PluginContract.ACTION_CONFIGURE)
PluginContract.ACTION_CONFIGURE)
if (intent.resolveActivity(requireContext().packageManager) == null) showPluginEditor() else { if (intent.resolveActivity(requireContext().packageManager) == null) showPluginEditor() else {
startActivityForResult(intent startActivityForResult(intent
.putExtra(PluginContract.EXTRA_OPTIONS, pluginConfiguration.getOptions().toString()), .putExtra(PluginContract.EXTRA_OPTIONS, pluginConfiguration.getOptions().toString()),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment