aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/pixart
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/de/pixart')
-rw-r--r--src/main/java/de/pixart/messenger/Config.java2
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationFragment.java3
-rw-r--r--src/main/java/de/pixart/messenger/ui/XmppActivity.java11
3 files changed, 0 insertions, 16 deletions
diff --git a/src/main/java/de/pixart/messenger/Config.java b/src/main/java/de/pixart/messenger/Config.java
index 4992818c1..26685eb4d 100644
--- a/src/main/java/de/pixart/messenger/Config.java
+++ b/src/main/java/de/pixart/messenger/Config.java
@@ -141,8 +141,6 @@ public final class Config {
public static final long UPDATE_CHECK_TIMER = 24 * 60 * 60; // 24 h 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/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 18cbefec3..5e24ecb2c 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -1095,7 +1095,6 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
boolean hasAttachments = mediaPreviewAdapter != null && mediaPreviewAdapter.hasAttachments();
menuInflater.inflate(R.menu.fragment_conversation, menu);
final MenuItem menuInviteContact = menu.findItem(R.id.action_invite);
- final MenuItem menuNeedHelp = menu.findItem(R.id.action_create_issue);
final MenuItem menuSearchUpdates = menu.findItem(R.id.action_check_updates);
final MenuItem menuArchiveChat = menu.findItem(R.id.action_archive_chat);
final MenuItem menuGroupDetails = menu.findItem(R.id.action_group_details);
@@ -1125,12 +1124,10 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
menuContactDetails.setVisible(false);
}
menuMediaBrowser.setVisible(true);
- menuNeedHelp.setVisible(true);
menuSearchUpdates.setVisible(false);
ConversationMenuConfigurator.configureAttachmentMenu(conversation, menu, activity.xmppConnectionService.getAttachmentChoicePreference(), hasAttachments);
ConversationMenuConfigurator.configureEncryptionMenu(conversation, menu);
} else {
- menuNeedHelp.setVisible(false);
menuSearchUpdates.setVisible(true);
menuInviteContact.setVisible(false);
menuGroupDetails.setVisible(false);
diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
index 7f17d4b68..7b1f9d0f2 100644
--- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
@@ -362,9 +362,6 @@ public abstract class XmppActivity extends ActionBarActivity {
@Override
public boolean onOptionsItemSelected(final MenuItem item) {
switch (item.getItemId()) {
- case R.id.action_create_issue:
- createIssue();
- break;
case R.id.action_settings:
startActivity(new Intent(this, SettingsActivity.class));
overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
@@ -1048,14 +1045,6 @@ public abstract class XmppActivity extends ActionBarActivity {
return null;
}
- private void createIssue() {
- String IssueURL = Config.ISSUE_URL;
- Intent intent = new Intent(Intent.ACTION_VIEW);
- intent.setData(Uri.parse(IssueURL));
- startActivity(intent);
- overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
- }
-
protected void shareLink(boolean http) {
String uri = getShareableUri(http);
if (uri == null || uri.isEmpty()) {