Skip to content

fix: intent builder history nil result #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sdex merged 1 commit into from
Sep 5, 2023
Merged

fix: intent builder history nil result #52

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions app/src/main/java/com/sdex/activityrunner/intent/IntentBuilderActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@ import com.sdex.activityrunner.commons.BaseActivity
import com.sdex.activityrunner.databinding.ActivityIntentBuilderBinding
import com.sdex.activityrunner.extensions.parcelable
import com.sdex.activityrunner.extensions.serializable
import com.sdex.activityrunner.intent.LaunchParamsExtraListAdapter.*
import com.sdex.activityrunner.intent.LaunchParamsExtraListAdapter.Callback
import com.sdex.activityrunner.intent.converter.LaunchParamsToIntentConverter
import com.sdex.activityrunner.intent.dialog.*
import com.sdex.activityrunner.intent.dialog.ExtraInputDialog
import com.sdex.activityrunner.intent.dialog.MultiSelectionDialog
import com.sdex.activityrunner.intent.dialog.SingleSelectionDialog
import com.sdex.activityrunner.intent.dialog.ValueInputDialog
import com.sdex.activityrunner.intent.history.HistoryActivity
import com.sdex.activityrunner.intent.param.Action
import com.sdex.activityrunner.intent.param.MimeType
Expand All @@ -41,9 +44,11 @@ class IntentBuilderActivity : BaseActivity(),

private val pickHistoryItem =
registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
val result = it.data?.parcelable<LaunchParams>(HistoryActivity.RESULT)
launchParams.setFrom(result)
showLaunchParams()
it.data?.let { intent ->
val result = intent.parcelable<LaunchParams>(HistoryActivity.RESULT)
launchParams.setFrom(result)
showLaunchParams()
}
}

override fun onCreate(savedInstanceState: Bundle?) {
Expand Down Expand Up @@ -131,6 +136,7 @@ class IntentBuilderActivity : BaseActivity(),
pickHistoryItem.launch(HistoryActivity.getLaunchIntent(this))
true
}

else -> super.onOptionsItemSelected(item)
}
}
Expand All @@ -152,6 +158,7 @@ class IntentBuilderActivity : BaseActivity(),
launchParams.action = if (position == 0) null
else Action.getAction(Action.list()[position])
}

R.string.launch_param_mime_type -> {
launchParams.mimeType = if (position == 0) null
else MimeType.list()[position]
Expand Down Expand Up @@ -231,10 +238,12 @@ class IntentBuilderActivity : BaseActivity(),
if (launchParams.action == null) 0
else Action.getActionKeyPosition(launchParams.action!!)
}

R.string.launch_param_mime_type -> {
if (launchParams.mimeType == null) 0
else MimeType.list().indexOf(launchParams.mimeType!!)
}

else -> throw IllegalStateException("Unknown type $type")
}
}
Expand Down