sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added missing return statement. fixed api bug

This commit is contained in:
iNPUTmice 2014-11-04 11:04:05 +01:00
parent 17070d972e
commit 12e2f0bdd7
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
View File

@ -45,7 +45,6 @@ import com.google.zxing.integration.android.IntentResult;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URLDecoder; import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
@ -589,7 +588,7 @@ public class StartConversationActivity extends XmppActivity {
} }
case Intent.ACTION_VIEW: case Intent.ACTION_VIEW:
invite = new Invite(intent.getData()); invite = new Invite(intent.getData());
invite.invite(); return invite.invite();
case NfcAdapter.ACTION_NDEF_DISCOVERED: case NfcAdapter.ACTION_NDEF_DISCOVERED:
Parcelable[] messages = getIntent().getParcelableArrayExtra(NfcAdapter.EXTRA_NDEF_MESSAGES); Parcelable[] messages = getIntent().getParcelableArrayExtra(NfcAdapter.EXTRA_NDEF_MESSAGES);
NdefMessage message = (NdefMessage) messages[0]; NdefMessage message = (NdefMessage) messages[0];
@ -600,7 +599,7 @@ public class StartConversationActivity extends XmppActivity {
byte[] mPayload = record.getPayload(); byte[] mPayload = record.getPayload();
if (mPayload[0] == 0) { if (mPayload[0] == 0) {
invite = new Invite(Uri.parse(new String(Arrays.copyOfRange( invite = new Invite(Uri.parse(new String(Arrays.copyOfRange(
mPayload, 1, mPayload.length), StandardCharsets.UTF_8))); mPayload, 1, mPayload.length))));
} }
} }
if (invite != null) { if (invite != null) {