mirror of
https://github.com/oxen-io/session-android.git
synced 2025-10-25 12:48:33 +00:00
fix handling of sms:, smsto:, mms:, mmsto: URIs
1) add VIEW action and BROWSABLE category to SmsSendtoActivity intent filter 2) created class Rfc5724Uri for processing RFC5724 SMS URIs 3) added a set of tests for new Rfc5724Uri class 4) updated SmsSendtoActivity to use Rfc5742Uri for processing VIEW intents Fixes #2578 Closes #3030 // FREEBIE
This commit is contained in:
committed by
Moxie Marlinspike
parent
3fe676a3dd
commit
8f002bd68d
@@ -3,13 +3,20 @@ package org.thoughtcrime.securesms;
|
||||
import android.app.Activity;
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.util.Log;
|
||||
import android.widget.Toast;
|
||||
|
||||
import org.thoughtcrime.securesms.database.DatabaseFactory;
|
||||
import org.thoughtcrime.securesms.recipients.RecipientFactory;
|
||||
import org.thoughtcrime.securesms.recipients.Recipients;
|
||||
import org.thoughtcrime.securesms.util.Rfc5724Uri;
|
||||
|
||||
import java.net.URISyntaxException;
|
||||
|
||||
public class SmsSendtoActivity extends Activity {
|
||||
|
||||
private static final String TAG = SmsSendtoActivity.class.getSimpleName();
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
startActivity(getNextIntent(getIntent()));
|
||||
@@ -18,8 +25,22 @@ public class SmsSendtoActivity extends Activity {
|
||||
}
|
||||
|
||||
private Intent getNextIntent(Intent original) {
|
||||
String body = original.getStringExtra("sms_body");
|
||||
String data = original.getData().getSchemeSpecificPart();
|
||||
String body = "";
|
||||
String data = "";
|
||||
|
||||
if (original.getAction().equals(Intent.ACTION_SENDTO)) {
|
||||
body = original.getStringExtra("sms_body");
|
||||
data = original.getData().getSchemeSpecificPart();
|
||||
} else {
|
||||
try {
|
||||
Rfc5724Uri smsUri = new Rfc5724Uri(original.getData().toString());
|
||||
body = smsUri.getQueryParams().get("body");
|
||||
data = smsUri.getPath();
|
||||
} catch (URISyntaxException e) {
|
||||
Log.w(TAG, "unable to parse RFC5724 URI from intent", e);
|
||||
}
|
||||
}
|
||||
|
||||
Recipients recipients = RecipientFactory.getRecipientsFromString(this, data, false);
|
||||
long threadId = DatabaseFactory.getThreadDatabase(this).getThreadIdIfExistsFor(recipients);
|
||||
|
||||
|
||||
80
src/org/thoughtcrime/securesms/util/Rfc5724Uri.java
Normal file
80
src/org/thoughtcrime/securesms/util/Rfc5724Uri.java
Normal file
@@ -0,0 +1,80 @@
|
||||
/*
|
||||
* Copyright (C) 2015 Open Whisper Systems
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package org.thoughtcrime.securesms.util;
|
||||
|
||||
import java.net.URISyntaxException;
|
||||
import java.net.URLDecoder;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
public class Rfc5724Uri {
|
||||
|
||||
private final String uri;
|
||||
private final String schema;
|
||||
private final String path;
|
||||
private final Map<String, String> queryParams;
|
||||
|
||||
public Rfc5724Uri(String uri) throws URISyntaxException {
|
||||
this.uri = uri;
|
||||
this.schema = parseSchema();
|
||||
this.path = parsePath();
|
||||
this.queryParams = parseQueryParams();
|
||||
}
|
||||
|
||||
private String parseSchema() throws URISyntaxException {
|
||||
String[] parts = uri.split(":");
|
||||
|
||||
if (parts.length < 1 || parts[0].isEmpty()) throw new URISyntaxException(uri, "invalid schema");
|
||||
else return parts[0];
|
||||
}
|
||||
|
||||
private String parsePath() throws URISyntaxException {
|
||||
String[] parts = uri.split("\\?")[0].split(":", 2);
|
||||
|
||||
if (parts.length < 2 || parts[1].isEmpty()) throw new URISyntaxException(uri, "invalid path");
|
||||
else return parts[1];
|
||||
}
|
||||
|
||||
private Map<String, String> parseQueryParams() throws URISyntaxException {
|
||||
Map<String, String> queryParams = new HashMap<>();
|
||||
if (uri.split("\\?").length < 2) {
|
||||
return queryParams;
|
||||
}
|
||||
|
||||
for (String keyValue : uri.split("\\?")[1].split("&")) {
|
||||
String[] parts = keyValue.split("=");
|
||||
|
||||
if (parts.length == 1) queryParams.put(parts[0], "");
|
||||
else queryParams.put(parts[0], URLDecoder.decode(parts[1]));
|
||||
}
|
||||
|
||||
return queryParams;
|
||||
}
|
||||
|
||||
public String getSchema() {
|
||||
return schema;
|
||||
}
|
||||
|
||||
public String getPath() {
|
||||
return path;
|
||||
}
|
||||
|
||||
public Map<String, String> getQueryParams() {
|
||||
return queryParams;
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user