Skip to content

Commit 57613e1

Browse files
committed
Update support options to link to new support accounts
1 parent 337e019 commit 57613e1

File tree

2 files changed

+30
-13
lines changed

2 files changed

+30
-13
lines changed

src/main/kotlin/me/proxer/app/settings/AboutFragment.kt

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
package me.proxer.app.settings
22

3+
import android.content.ActivityNotFoundException
34
import android.content.ClipData
45
import android.content.ClipboardManager
56
import android.content.Context
7+
import android.content.Intent
8+
import android.net.Uri
69
import android.os.Bundle
710
import androidx.core.content.ContextCompat
811
import androidx.core.content.getSystemService
@@ -27,7 +30,6 @@ import me.proxer.app.chat.prv.Participant
2730
import me.proxer.app.chat.prv.PrvMessengerActivity
2831
import me.proxer.app.chat.prv.create.CreateConferenceActivity
2932
import me.proxer.app.chat.prv.sync.MessengerDao
30-
import me.proxer.app.forum.TopicActivity
3133
import me.proxer.app.profile.ProfileActivity
3234
import me.proxer.app.settings.status.ServerStatusActivity
3335
import me.proxer.app.util.extension.androidUri
@@ -54,12 +56,12 @@ class AboutFragment : MaterialAboutFragment(), CustomTabsAware {
5456
private val discordLink = "https://discord.gg/XwrEDmA".toPrefixedHttpUrl()
5557
private val repositoryLink = "https://github.com/proxer/ProxerAndroid".toPrefixedHttpUrl()
5658

57-
private const val supportId = "374605"
58-
private const val supportCategory = "anwendungen"
59+
private const val supportProxerMail = "[email protected]"
60+
private const val supportProxerName = "Support"
5961

62+
private const val developerGithubName = "rubengees"
6063
private const val developerProxerName = "RubyGee"
6164
private const val developerProxerId = "121658"
62-
private const val developerGithubName = "rubengees"
6365

6466
fun newInstance() = AboutFragment().apply {
6567
arguments = bundleOf()
@@ -235,19 +237,19 @@ class AboutFragment : MaterialAboutFragment(), CustomTabsAware {
235237
.text(R.string.about_support_message_title)
236238
.subText(R.string.about_support_message_description)
237239
.icon(
238-
IconicsDrawable(context, CommunityMaterial.Icon.cmd_email).apply {
240+
IconicsDrawable(context, CommunityMaterial.Icon2.cmd_forum).apply {
239241
colorInt = context.resolveColor(R.attr.colorIcon)
240242
}
241243
)
242244
.setOnClickAction {
243245
Completable
244246
.fromAction {
245-
messengerDao.findConferenceForUser(developerProxerName).let { existingConference ->
247+
messengerDao.findConferenceForUser(supportProxerName).let { existingConference ->
246248
when (existingConference) {
247249
null -> CreateConferenceActivity.navigateTo(
248250
requireActivity(),
249251
false,
250-
Participant(developerProxerName)
252+
Participant(supportProxerName)
251253
)
252254
else -> PrvMessengerActivity.navigateTo(requireActivity(), existingConference)
253255
}
@@ -257,14 +259,27 @@ class AboutFragment : MaterialAboutFragment(), CustomTabsAware {
257259
.subscribeAndLogErrors()
258260
}.build(),
259261
MaterialAboutActionItem.Builder()
260-
.text(R.string.about_support_forum_title)
261-
.subText(R.string.about_support_forum_description)
262+
.text(R.string.about_support_mail_title)
263+
.subText(R.string.about_support_mail_description)
262264
.icon(
263-
IconicsDrawable(context, CommunityMaterial.Icon2.cmd_forum).apply {
265+
IconicsDrawable(context, CommunityMaterial.Icon.cmd_email).apply {
264266
colorInt = context.resolveColor(R.attr.colorIcon)
265267
}
266268
)
267-
.setOnClickAction { TopicActivity.navigateTo(requireActivity(), supportId, supportCategory) }
269+
.setOnClickAction {
270+
val intent = Intent(Intent.ACTION_SENDTO).apply {
271+
data = Uri.parse("mailto:")
272+
273+
putExtra(Intent.EXTRA_EMAIL, arrayOf(supportProxerMail))
274+
putExtra(Intent.EXTRA_SUBJECT, getString(R.string.about_support_mail_subject))
275+
}
276+
277+
try {
278+
startActivity(intent)
279+
} catch (error: ActivityNotFoundException) {
280+
requireContext().toast(R.string.about_error_mail_no_activity)
281+
}
282+
}
268283
.build()
269284
)
270285

src/main/res/values/strings.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -887,13 +887,15 @@
887887
Bitte prüfe den Serverstatus bevor du einen Fehler meldest.
888888
Wenn es sich nicht um ein technisches Problem handelt, wende dich bitte an das zutreffende Team
889889
</string>
890-
<string name="about_support_forum_title">Forum</string>
891-
<string name="about_support_forum_description">Berichte Fehler oder mache Verbesserungsvorschläge im Forum</string>
892890
<string name="about_support_message_title">Nachricht</string>
893891
<string name="about_support_message_description">Berichte Fehler oder mache Verbesserungsvorschläge per PN</string>
892+
<string name="about_support_mail_title">E-Mail</string>
893+
<string name="about_support_mail_description">Berichte Fehler oder mache Verbesserungsvorschläge per Mail</string>
894+
<string name="about_support_mail_subject">Proxer.Me Android App Support</string>
894895
<string name="about_developer_title">Entwickler</string>
895896
<string name="about_developer_github_title">GitHub</string>
896897
<string name="about_developer_proxer_title">Proxer</string>
898+
<string name="about_error_mail_no_activity">Es ist keine E-Mail App installiert</string>
897899

898900
<string name="introduction_welcome_title">Willkommen!</string>
899901
<string name="introduction_welcome_description">Ein paar Einstellungen und es geht los</string>

0 commit comments

Comments
 (0)