diff options
| author | Allan Wang <me@allanwang.ca> | 2021-01-12 00:00:44 -0800 |
|---|---|---|
| committer | Allan Wang <me@allanwang.ca> | 2021-01-12 00:00:44 -0800 |
| commit | 82fa4c5d6c75e245e74d903328b3e5d96b01b5ca (patch) | |
| tree | 98250a0cd09119312c4eaabf246e7172f157a474 /app/src/main/kotlin/com/pitchedapps/frost/utils | |
| parent | fd2cbf25f5744a939ef6245809a1655e013a6420 (diff) | |
| parent | 68db99597b68c87f1e0eb2d1feb6b6c63bbff1e9 (diff) | |
| download | frost-82fa4c5d6c75e245e74d903328b3e5d96b01b5ca.tar.gz frost-82fa4c5d6c75e245e74d903328b3e5d96b01b5ca.tar.bz2 frost-82fa4c5d6c75e245e74d903328b3e5d96b01b5ca.zip | |
Merge branch 'dev' into messenger
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/utils')
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt | 3 | ||||
| -rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/utils/WebContextMenu.kt | 15 |
2 files changed, 2 insertions, 16 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt index 63483da0..883ea9aa 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt @@ -409,7 +409,7 @@ inline fun Context.sendFrostEmail( sendFrostEmail(string(subjectId), builder) inline fun Context.sendFrostEmail(subjectId: String, crossinline builder: EmailBuilder.() -> Unit) = - sendEmail(string(R.string.dev_email), subjectId) { + sendEmail("", subjectId) { builder() addFrostDetails() } @@ -418,7 +418,6 @@ fun EmailBuilder.addFrostDetails() { val prefs = Prefs.get() addItem("Prev version", prefs.prevVersionCode.toString()) val proTag = "FO" -// if (IS_FROST_PRO) "TY" else "FP" addItem("Random Frost ID", "${prefs.frostId}-$proTag") addItem("Locale", Locale.getDefault().displayName) } diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/WebContextMenu.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/WebContextMenu.kt index 3ab924e2..03dbb9fb 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/utils/WebContextMenu.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/WebContextMenu.kt @@ -75,20 +75,7 @@ enum class WebContextType( { c, wc, fc -> c.launchWebOverlay(wc.url!!, fc, Prefs.get()) }), COPY_LINK(R.string.copy_link, { it.hasUrl }, { c, wc, _ -> c.copyToClipboard(wc.url) }), COPY_TEXT(R.string.copy_text, { it.hasText }, { c, wc, _ -> c.copyToClipboard(wc.text) }), - SHARE_LINK(R.string.share_link, { it.hasUrl }, { c, wc, _ -> c.shareText(wc.url) }), - DEBUG_LINK(R.string.debug_link, { it.hasUrl }, { c, wc, _ -> - c.materialDialog { - title(R.string.debug_link) - message(R.string.debug_link_desc) - positiveButton(R.string.kau_ok) { - c.sendFrostEmail(R.string.debug_link_subject) { - message = c.string(R.string.debug_link_content) - addItem("Unformatted url", wc.unformattedUrl!!) - addItem("Formatted url", wc.url!!) - } - } - } - }) + SHARE_LINK(R.string.share_link, { it.hasUrl }, { c, wc, _ -> c.shareText(wc.url) }) ; companion object { |