diff options
author | Allan Wang <me@allanwang.ca> | 2017-10-07 01:51:47 -0400 |
---|---|---|
committer | Allan Wang <me@allanwang.ca> | 2017-10-07 01:51:47 -0400 |
commit | 6bca83c464337c37ebcbabe47f8a8e2e44dd4794 (patch) | |
tree | 3d583fcb9cda549b7bd5383e88fe85cc3eeae55c /app/src/main/kotlin/com/pitchedapps/frost/utils | |
parent | 795572dee04f03de70a013907e886d32df747fa0 (diff) | |
download | frost-6bca83c464337c37ebcbabe47f8a8e2e44dd4794.tar.gz frost-6bca83c464337c37ebcbabe47f8a8e2e44dd4794.tar.bz2 frost-6bca83c464337c37ebcbabe47f8a8e2e44dd4794.zip |
Create email sender basev1.5.6
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/utils')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt | 14 | ||||
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/utils/WebContextMenu.kt | 6 |
2 files changed, 16 insertions, 4 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 aeddd20c..5726409c 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Utils.kt @@ -13,6 +13,8 @@ import android.support.v7.widget.Toolbar import android.view.View import android.widget.FrameLayout import android.widget.TextView +import ca.allanwang.kau.email.EmailBuilder +import ca.allanwang.kau.email.sendEmail import ca.allanwang.kau.mediapicker.createMediaFile import ca.allanwang.kau.mediapicker.createPrivateMediaFile import ca.allanwang.kau.utils.* @@ -31,6 +33,7 @@ import com.pitchedapps.frost.facebook.FACEBOOK_COM import com.pitchedapps.frost.facebook.FbCookie import com.pitchedapps.frost.facebook.FbItem import com.pitchedapps.frost.facebook.formattedFbUrl +import com.pitchedapps.frost.utils.iab.IS_FROST_PRO import java.io.IOException import java.util.* @@ -206,4 +209,15 @@ fun Context.frostChangelog() = showChangelog(R.xml.frost_changelog, Prefs.textCo } } +inline fun Context.sendFrostEmail(@StringRes subjectId: Int, crossinline builder: EmailBuilder.() -> Unit) + = sendFrostEmail(string(subjectId), builder) + +inline fun Context.sendFrostEmail(subjectId: String, crossinline builder: EmailBuilder.() -> Unit) + = sendEmail(string(R.string.dev_email), subjectId) { + builder() + val proTag = if (IS_FROST_PRO) "TY" else "FP" + addItem("Random Frost ID", "${Prefs.frostId}-$proTag") +} + + 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 3918a993..dc2d7549 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/utils/WebContextMenu.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/WebContextMenu.kt @@ -1,7 +1,6 @@ package com.pitchedapps.frost.utils import android.content.Context -import ca.allanwang.kau.email.sendEmail import ca.allanwang.kau.utils.copyToClipboard import ca.allanwang.kau.utils.shareText import ca.allanwang.kau.utils.string @@ -25,8 +24,7 @@ fun Context.showWebContextMenu(wc: WebContext) { if (it == WebContextType.COPY_TEXT && wc.text == null) return@map null this@showWebContextMenu.string(it.textId) }.filterNotNull()) - itemsCallback { - _, _, position, _ -> + itemsCallback { _, _, position, _ -> WebContextType[position].onClick(this@showWebContextMenu, wc) } dismissListener { @@ -51,7 +49,7 @@ enum class WebContextType(val textId: Int, val onClick: (c: Context, wc: WebCont content(R.string.debug_link_desc) positiveText(R.string.kau_ok) onPositive { _, _ -> - c.sendEmail(R.string.dev_email, R.string.debug_link_subject) { + 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) |