aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2015-11-20 22:49:56 +0100
committersteckbrief <steckbrief@chefmail.de>2015-11-20 22:49:56 +0100
commit9efc13983516c4c37540eb9544f8fa411ded81c7 (patch)
tree9a4065ffc95ca82d1bb1611a0718deb7abff0270
parent2531c88f2c8a992aa0c40c9f96e88099dc94139e (diff)
Partially implements FS#6: Conference ID changed to c+bugs@confere
nce.thedevstack.de
-rw-r--r--Conversations-Plus-ChangeLog.md2
-rw-r--r--src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHelper.java2
-rw-r--r--src/main/res/values/strings.xml1
3 files changed, 4 insertions, 1 deletions
diff --git a/Conversations-Plus-ChangeLog.md b/Conversations-Plus-ChangeLog.md
index 086f3b18..ac35571b 100644
--- a/Conversations-Plus-ChangeLog.md
+++ b/Conversations-Plus-ChangeLog.md
@@ -5,9 +5,11 @@
* Fixes FS#81: Interactive message loading causes "jumps"
* Implements FS#78: Allow installation on SD card
* Fixes FS#70: Fixed Identity Strings
+* Implements FS#67: Display logcat within application
* Fixes FS#47: Setting "WLAN only" no longer works for received links
* Implements FS#26: Introduce dialog to choose whether to send resized picture or original picture
* Implements FS#24: Introduce setting for picture resizing
+* Partially implements FS#6: Change "Report bug to developer" - Reporting conference changed to c+bugs@conference.thedevstack.de
####Version 0.0.5
* Fixes FS#73: Open list of resources while clicking on JID in contact details
diff --git a/src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHelper.java b/src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHelper.java
index 999d1027..1b2a5a96 100644
--- a/src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHelper.java
+++ b/src/main/java/de/thedevstack/conversationsplus/utils/ExceptionHelper.java
@@ -93,7 +93,7 @@ public class ExceptionHelper {
Conversation conversation = null;
try {
conversation = service.findOrCreateConversation(finalAccount,
- Jid.fromString("bugs@siacs.eu"), false);
+ Jid.fromString(context.getString(R.string.cplus_bugreport_jabberid)), false);
} catch (final InvalidJidException ignored) {
}
Message message = new Message(conversation, report
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 8eaf2b37..124c6635 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -534,4 +534,5 @@
<string name="cplus_copied_to_clipboard">Copied to clipboard</string>
<string name="pref_show_logcat_title">Show logcat output</string>
<string name="pref_show_logcat_summary">Shows the output of logcat. This is useful for debugging.</string>
+ <string name="cplus_bugreport_jabberid">c+bugs@conference.thedevstack.de</string>
</resources>