-
-
Notifications
You must be signed in to change notification settings - Fork 109
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Show warning when request contains invalid JSON
- Loading branch information
Showing
10 changed files
with
181 additions
and
60 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
...n/ch/rmy/android/http_shortcuts/activities/execute/usecases/ValidateRequestDataUseCase.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| package ch.rmy.android.http_shortcuts.activities.execute.usecases | ||
|
|
||
| import ch.rmy.android.framework.utils.localization.StringResLocalizable | ||
| import ch.rmy.android.http_shortcuts.R | ||
| import ch.rmy.android.http_shortcuts.activities.execute.DialogHandle | ||
| import ch.rmy.android.http_shortcuts.activities.execute.ExecuteDialogState | ||
| import ch.rmy.android.http_shortcuts.data.models.Shortcut | ||
| import ch.rmy.android.http_shortcuts.exceptions.DialogCancellationException | ||
| import ch.rmy.android.http_shortcuts.http.RequestData | ||
| import ch.rmy.android.http_shortcuts.utils.GsonUtil | ||
| import ch.rmy.android.http_shortcuts.utils.Settings | ||
| import com.google.gson.JsonParseException | ||
| import javax.inject.Inject | ||
|
|
||
| class ValidateRequestDataUseCase | ||
| @Inject | ||
| constructor( | ||
| private val settings: Settings, | ||
| ) { | ||
| suspend operator fun invoke(dialogHandle: DialogHandle, shortcut: Shortcut, requestData: RequestData) { | ||
| if (!shortcut.usesCustomBody()) { | ||
| return | ||
| } | ||
| if (requestData.contentType?.startsWith("application/json", ignoreCase = true) != true) { | ||
| return | ||
| } | ||
| if (settings.isMalformedJsonWarningPermanentlyHidden) { | ||
| return | ||
| } | ||
| try { | ||
| GsonUtil.prettyPrintOrThrow(requestData.body) | ||
| } catch (e: JsonParseException) { | ||
| GsonUtil.extractErrorMessage(e) | ||
| ?.let { errorMessage -> | ||
| try { | ||
| dialogHandle.showDialog( | ||
| ExecuteDialogState.Warning( | ||
| title = StringResLocalizable(R.string.warning_dialog_title), | ||
| message = StringResLocalizable(R.string.warning_message_malformed_json, errorMessage), | ||
| onHidden = { | ||
| settings.isMalformedJsonWarningPermanentlyHidden = it | ||
| }, | ||
| ) | ||
| ) | ||
| } catch (e: DialogCancellationException) { | ||
| // Continue as normal | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
75 changes: 75 additions & 0 deletions
75
HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/components/HideableDialog.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| package ch.rmy.android.http_shortcuts.components | ||
|
|
||
| import androidx.compose.foundation.clickable | ||
| import androidx.compose.foundation.layout.Arrangement | ||
| import androidx.compose.foundation.layout.Column | ||
| import androidx.compose.foundation.layout.Row | ||
| import androidx.compose.foundation.layout.fillMaxWidth | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.material3.AlertDialog | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.material3.TextButton | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.runtime.mutableStateOf | ||
| import androidx.compose.runtime.remember | ||
| import androidx.compose.runtime.setValue | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.res.stringResource | ||
| import androidx.compose.ui.text.style.TextOverflow | ||
| import ch.rmy.android.http_shortcuts.R | ||
|
|
||
| @Composable | ||
| fun HideableDialog( | ||
| title: String? = null, | ||
| message: String, | ||
| onHidden: (Boolean) -> Unit, | ||
| onDismissed: () -> Unit, | ||
| ) { | ||
| var permanentlyHidden by remember { | ||
| mutableStateOf(false) | ||
| } | ||
| AlertDialog( | ||
| onDismissRequest = onDismissed, | ||
| title = title?.let { | ||
| { | ||
| Text(it) | ||
| } | ||
| }, | ||
| text = { | ||
| Column( | ||
| verticalArrangement = Arrangement.spacedBy(Spacing.MEDIUM), | ||
| ) { | ||
| Text(message) | ||
| Row( | ||
| modifier = Modifier | ||
| .fillMaxWidth() | ||
| .clickable { | ||
| permanentlyHidden = !permanentlyHidden | ||
| onHidden(permanentlyHidden) | ||
| } | ||
| .padding(Spacing.TINY), | ||
| horizontalArrangement = Arrangement.spacedBy(Spacing.SMALL, Alignment.Start), | ||
| verticalAlignment = Alignment.CenterVertically, | ||
| ) { | ||
| androidx.compose.material3.Checkbox( | ||
| checked = permanentlyHidden, | ||
| onCheckedChange = null, | ||
| ) | ||
| Text( | ||
| stringResource(R.string.dialog_checkbox_do_not_show_again), | ||
| fontSize = FontSize.MEDIUM, | ||
| maxLines = 1, | ||
| overflow = TextOverflow.Ellipsis, | ||
| ) | ||
| } | ||
| } | ||
| }, | ||
| confirmButton = { | ||
| TextButton(onClick = onDismissed) { | ||
| Text(stringResource(R.string.dialog_ok)) | ||
| } | ||
| }, | ||
| ) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters