1 files changed, 10 insertions, 4 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
index 4f9cb587a..624119bb8 100644
--- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java
@@ -97,6 +97,7 @@ import me.drakeet.support.toast.ToastCompat;
 import pl.droidsonroids.gif.GifDrawable;
 import rocks.xmpp.addr.Jid;
 
+import static de.pixart.messenger.ui.SettingsActivity.ENABLE_OTR_ENCRYPTION;
 import static de.pixart.messenger.ui.SettingsActivity.USE_BUNDLED_EMOJIS;
 import static de.pixart.messenger.ui.SettingsActivity.USE_INTERNAL_UPDATER;
 
@@ -111,6 +112,7 @@ public abstract class XmppActivity extends ActionBarActivity {
     public static final String EXTRA_ACCOUNT = "account";
 
     public XmppConnectionService xmppConnectionService;
+    public MediaBrowserActivity mediaBrowserActivity;
     public boolean xmppConnectionServiceBound = false;
 
     protected int mColorWarningButton;
@@ -438,6 +440,10 @@ public abstract class XmppActivity extends ActionBarActivity {
         return getBooleanPreference("unicolored_chatbg", R.bool.use_unicolored_chatbg);
     }
 
+    public boolean enableOTR() {
+        return getBooleanPreference(ENABLE_OTR_ENCRYPTION, R.bool.enable_otr);
+    }
+
     public void setBubbleColor(final View v, final int backgroundColor, final int borderColor) {
         GradientDrawable shape = (GradientDrawable) v.getBackground();
         shape.setColor(backgroundColor);
@@ -528,10 +534,10 @@ public abstract class XmppActivity extends ActionBarActivity {
             intent.putExtra(Intent.EXTRA_TEXT, text);
             if (asQuote) {
                 intent.putExtra(ConversationsActivity.EXTRA_AS_QUOTE, true);
-                intent.putExtra(ConversationsActivity.EXTRA_ACCOUNT, nick);
+                intent.putExtra(ConversationsActivity.EXTRA_USER, nick);
             }
         }
-        if (nick != null) {
+        if (nick != null && !asQuote) {
             intent.putExtra(ConversationsActivity.EXTRA_NICK, nick);
             intent.putExtra(ConversationsActivity.EXTRA_IS_PRIVATE_MESSAGE, pm);
         }
@@ -1092,8 +1098,8 @@ public abstract class XmppActivity extends ActionBarActivity {
         protected String doInBackground(XmppConnection... params) {
             String uri = null;
             if (this.connection != null) {
-                XmppConnection.Features features = connection.getFeatures();
-                if (features.adhocinvite) {
+                XmppConnection.Features features = this.connection.getFeatures();
+                if (features != null && features.adhocinvite) {
                     int i = 0;
                     uri = this.connection.getAdHocInviteUrl(Jid.ofDomain(this.account.getJid().getDomain()));
                     try {