aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-11-04 11:04:05 +0100
committeriNPUTmice <daniel@gultsch.de>2014-11-04 11:04:05 +0100
commit12e2f0bdd72414b702138ff919a42f3bee1fa918 (patch)
tree8c16a3b0e6b4c76210ba3775252c8ed60af58afe /src/main/java/eu/siacs/conversations
parent17070d972e78d1ef401b40ee1d659896020be4eb (diff)
added missing return statement. fixed api bug
Diffstat (limited to 'src/main/java/eu/siacs/conversations')
-rw-r--r--src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index 87670f789..65bc7e63b 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -45,7 +45,6 @@ import com.google.zxing.integration.android.IntentResult;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
-import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -589,7 +588,7 @@ public class StartConversationActivity extends XmppActivity {
}
case Intent.ACTION_VIEW:
invite = new Invite(intent.getData());
- invite.invite();
+ return invite.invite();
case NfcAdapter.ACTION_NDEF_DISCOVERED:
Parcelable[] messages = getIntent().getParcelableArrayExtra(NfcAdapter.EXTRA_NDEF_MESSAGES);
NdefMessage message = (NdefMessage) messages[0];
@@ -600,7 +599,7 @@ public class StartConversationActivity extends XmppActivity {
byte[] mPayload = record.getPayload();
if (mPayload[0] == 0) {
invite = new Invite(Uri.parse(new String(Arrays.copyOfRange(
- mPayload, 1, mPayload.length), StandardCharsets.UTF_8)));
+ mPayload, 1, mPayload.length))));
}
}
if (invite != null) {