aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-11-10 23:47:04 +0100
committeriNPUTmice <daniel@gultsch.de>2014-11-11 17:40:51 +0100
commit76f4cf1a73ccc3d11b1c794a802b9ff038164482 (patch)
tree27b5d1d0ece38ddd17daa552d6b352ec70aadc3f /src/main/java
parente33fc26cbe4f60b78cd57e9d4ceff7b3f6e3a6a0 (diff)
small bug fix
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java b/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
index e9850ea4..d33007fb 100644
--- a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
@@ -2,23 +2,18 @@ package eu.siacs.conversations.ui;
import android.content.Intent;
import android.os.Bundle;
-import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
-import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;
import android.widget.Toast;
import net.java.otr4j.OtrException;
-import net.java.otr4j.crypto.OtrCryptoException;
import net.java.otr4j.session.Session;
-import eu.siacs.conversations.Config;
import eu.siacs.conversations.R;
import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.entities.Contact;
import eu.siacs.conversations.entities.Conversation;
import eu.siacs.conversations.services.XmppConnectionService;
import eu.siacs.conversations.xmpp.jid.InvalidJidException;
@@ -144,14 +139,14 @@ public class VerifyOTRActivity extends XmppActivity implements XmppConnectionSer
}
protected boolean handleIntent(Intent intent) {
- if (getIntent().getAction().equals(ACTION_VERIFY_CONTACT)) {
+ if (intent.getAction().equals(ACTION_VERIFY_CONTACT)) {
try {
- this.mAccount = this.xmppConnectionService.findAccountByJid(Jid.fromString(getIntent().getExtras().getString("account")));
+ this.mAccount = this.xmppConnectionService.findAccountByJid(Jid.fromString(intent.getExtras().getString("account")));
} catch (final InvalidJidException ignored) {
return false;
}
try {
- this.mConversation = this.xmppConnectionService.find(this.mAccount,Jid.fromString(getIntent().getExtras().getString("contact")));
+ this.mConversation = this.xmppConnectionService.find(this.mAccount,Jid.fromString(intent.getExtras().getString("contact")));
if (this.mConversation == null) {
return false;
}