aboutsummaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorChristian Schneppe <christian@pix-art.de>2016-09-25 00:42:25 +0200
committerChristian Schneppe <christian@pix-art.de>2016-09-25 00:42:25 +0200
commit66301c4961b99b1fc650bb99c3578453b5c17ba5 (patch)
treeb194497505fa24968422b2e76bc7bd8a11a8a38b /src/main
parent107017bc3364ac1c408a941a6aa1922798ea1c38 (diff)
add actionbar item to report an issue via support conference
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/de/pixart/messenger/Config.java3
-rw-r--r--src/main/java/de/pixart/messenger/ui/XmppActivity.java10
-rw-r--r--src/main/res/menu/conversations.xml5
-rw-r--r--src/main/res/values-de/strings.xml1
-rw-r--r--src/main/res/values/strings.xml1
5 files changed, 19 insertions, 1 deletions
diff --git a/src/main/java/de/pixart/messenger/Config.java b/src/main/java/de/pixart/messenger/Config.java
index cf23878c8..936ef2ecf 100644
--- a/src/main/java/de/pixart/messenger/Config.java
+++ b/src/main/java/de/pixart/messenger/Config.java
@@ -1,7 +1,6 @@
package de.pixart.messenger;
import android.graphics.Bitmap;
-
import de.pixart.messenger.xmpp.chatstate.ChatState;
public final class Config {
@@ -132,6 +131,8 @@ public final class Config {
public static final String UPDATE_URL = "http://xmpp.pix-art.de/Pix-Art_Messenger/update/";
public static final long UPDATE_CHECK_TIMER = 24 * 60 * 60; // in seconds
+ public static final String ISSUE_URL = "xmpp://support@room.pix-art.de?join";
+
public static final String ENABLED_CIPHERS[] = {
"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA384",
diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
index 48d52a44b..35d4c8219 100644
--- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
@@ -389,6 +389,9 @@ public abstract class XmppActivity extends Activity {
case R.id.action_invite_user:
inviteUser();
break;
+ case R.id.action_create_issue:
+ createIssue();
+ break;
case R.id.action_settings:
startActivity(new Intent(this, SettingsActivity.class));
break;
@@ -1196,6 +1199,13 @@ public abstract class XmppActivity extends Activity {
startActivity(Intent.createChooser(intent, getString(R.string.invite_contact)));
}
+ private void createIssue() {
+ String IssueURL = Config.ISSUE_URL;
+ Intent intent = new Intent(Intent.ACTION_VIEW);
+ intent.setData(Uri.parse(IssueURL));
+ startActivity(intent);
+ }
+
protected void shareUri() {
String uri = getShareableUri();
if (uri == null || uri.isEmpty()) {
diff --git a/src/main/res/menu/conversations.xml b/src/main/res/menu/conversations.xml
index e4acd364f..4f0b98a34 100644
--- a/src/main/res/menu/conversations.xml
+++ b/src/main/res/menu/conversations.xml
@@ -79,6 +79,11 @@
android:showAsAction="never"
android:title="@string/invite_user" />
<item
+ android:id="@+id/action_create_issue"
+ android:orderInCategory="100"
+ android:showAsAction="never"
+ android:title="@string/create_issue" />
+ <item
android:id="@+id/action_check_updates"
android:orderInCategory="100"
android:showAsAction="never"
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 7044b195f..70692e9db 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -664,5 +664,6 @@
<string name="this_conference_has_no_members">Diese Konferenz enthält keine Teilnehmer.</string>
<string name="unable_to_update_account">Profil kann nicht aktualisiert werden.</string>
<string name="wrong_conference_configuration">Dies ist keine private, nicht-anonyme Konferenz.</string>
+ <string name="create_issue">Einen Fehler melden</string>
</resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 3aa14208e..9b7689d35 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -708,4 +708,5 @@
<string name="wrong_conference_configuration">This is not a private, non-anonymous conference.</string>
<string name="this_conference_has_no_members">There are no members in this conference.</string>
<string name="report_jid_as_spammer">Report this JID as sending unwanted messages.</string>
+ <string name="create_issue">Report an issue</string>
</resources>