diff options
author | Allan Wang <me@allanwang.ca> | 2021-01-11 21:26:02 -0800 |
---|---|---|
committer | Allan Wang <me@allanwang.ca> | 2021-01-11 21:26:02 -0800 |
commit | 3174728996fd970846f110f6cb349d7cd2caf9ba (patch) | |
tree | d08aebee5ca79113f7f153b08c043bfd79f94808 /app/src/main/kotlin/com/pitchedapps/frost/activities | |
parent | 58dbac5b01f9532375fd235fb21209424b6cf26a (diff) | |
download | frost-3174728996fd970846f110f6cb349d7cd2caf9ba.tar.gz frost-3174728996fd970846f110f6cb349d7cd2caf9ba.tar.bz2 frost-3174728996fd970846f110f6cb349d7cd2caf9ba.zip |
Add back email sender with blank email and remove more senders
Diffstat (limited to 'app/src/main/kotlin/com/pitchedapps/frost/activities')
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt | 10 | ||||
-rw-r--r-- | app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt | 11 |
2 files changed, 1 insertions, 20 deletions
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt index bcfd9c99..8f3cecf4 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/ImageActivity.kt @@ -363,15 +363,7 @@ internal enum class FabStates( ?: return activity.materialDialog { title(R.string.kau_error) - message(R.string.bad_image_overlay) - positiveButton(R.string.kau_yes) { - activity.sendFrostEmail(R.string.debug_image_link_subject) { - addItem("Url", activity.imageUrl) - addItem("Type", err.javaClass.name) - addItem("Message", err.message ?: "Null") - } - } - negativeButton(R.string.kau_no) + message(text = err.message) } } }, diff --git a/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt b/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt index a016ca22..d086b24c 100644 --- a/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/pitchedapps/frost/activities/SettingsActivity.kt @@ -29,19 +29,15 @@ import ca.allanwang.kau.kpref.activity.KPrefActivity import ca.allanwang.kau.kpref.activity.KPrefAdapterBuilder import ca.allanwang.kau.ui.views.RippleCanvas import ca.allanwang.kau.utils.finishSlideOut -import ca.allanwang.kau.utils.materialDialog import ca.allanwang.kau.utils.setMenuIcons import ca.allanwang.kau.utils.startActivityForResult import ca.allanwang.kau.utils.startLink -import ca.allanwang.kau.utils.string import ca.allanwang.kau.utils.tint import ca.allanwang.kau.utils.withSceneTransitionAnimation -import com.afollestad.materialdialogs.list.listItems import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial import com.mikepenz.iconics.typeface.library.googlematerial.GoogleMaterial import com.pitchedapps.frost.R import com.pitchedapps.frost.db.NotificationDao -import com.pitchedapps.frost.enums.Support import com.pitchedapps.frost.facebook.FbCookie import com.pitchedapps.frost.prefs.Prefs import com.pitchedapps.frost.settings.getAppearancePrefs @@ -249,7 +245,6 @@ class SettingsActivity : KPrefActivity() { toolbar.tint(prefs.iconColor) setMenuIcons( menu, prefs.iconColor, - R.id.action_email to GoogleMaterial.Icon.gmd_email, R.id.action_changelog to GoogleMaterial.Icon.gmd_info ) return true @@ -257,12 +252,6 @@ class SettingsActivity : KPrefActivity() { override fun onOptionsItemSelected(item: MenuItem): Boolean { when (item.itemId) { - R.id.action_email -> materialDialog { - title(R.string.subject) - listItems(items = Support.values().map { string(it.title) }) { _, index, _ -> - Support.values()[index].sendEmail(this@SettingsActivity) - } - } R.id.action_changelog -> frostChangelog() else -> return super.onOptionsItemSelected(item) } |