mir/kdeconnect-android
2
0
Fork 0
mirror of https://github.com/KDE/kdeconnect-android synced 2025-09-03 15:45:10 +00:00
Code Issues Releases Wiki Activity

Refactor share function to handle null URIs

Browse Source 
BUG: 458278
This commit is contained in:
Albert Vaca Cintora
2023-04-01 19:49:39 +02:00
parent 5250fde0b1
commit 711065a8e6
1 changed files with 49 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/org/kde/kdeconnect/Plugins/SharePlugin/SharePlugin.java
View File

@@ -37,8 +37,10 @@ import org.kde.kdeconnect.async.BackgroundJob;
import org.kde.kdeconnect.async.BackgroundJobHandler;
import org.kde.kdeconnect_tp.R;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collections;
/**
* A Plugin for sharing and receiving files and uris.
@@ -224,27 +226,11 @@ public class SharePlugin extends Plugin {
public void share(Intent intent) {
Bundle extras = intent.getExtras();
if (extras != null) {
if (extras.containsKey(Intent.EXTRA_STREAM)) {
try {
ArrayList<Uri> uriList;
if (!Intent.ACTION_SEND.equals(intent.getAction())) {
uriList = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM);
} else {
Uri uri = extras.getParcelable(Intent.EXTRA_STREAM);
uriList = new ArrayList<>();
uriList.add(uri);
}
sendUriList(uriList);
} catch (Exception e) {
Log.e("ShareActivity", "Exception");
e.printStackTrace();
}
} else if (extras.containsKey(Intent.EXTRA_TEXT)) {
ArrayList<Uri> streams = streamsFromIntent(intent, extras);
if (streams != null && !streams.isEmpty()) {
sendUriList(streams);
} else if (extras != null && extras.containsKey(Intent.EXTRA_TEXT)) {
Log.i("SharePlugin", "Intent contains text to share");
String text = extras.getString(Intent.EXTRA_TEXT);
String subject = extras.getString(Intent.EXTRA_SUBJECT);
@@ -255,12 +241,11 @@ public class SharePlugin extends Plugin {
text = text.substring(index + 2); //Skip ": "
}
}
boolean isUrl;
try {
new URL(text);
isUrl = true;
} catch (Exception e) {
} catch (MalformedURLException e) {
isUrl = false;
}
NetworkPacket np = new NetworkPacket(SharePlugin.PACKET_TYPE_SHARE_REQUEST);
@@ -270,8 +255,28 @@ public class SharePlugin extends Plugin {
np.set("text", text);
}
device.sendPacket(np);
} else {
Log.e("SharePlugin", "There's nothing we know how to share");
}
}
private ArrayList<Uri> streamsFromIntent(Intent intent, Bundle extras) {
if (extras == null || !extras.containsKey(Intent.EXTRA_STREAM)) {
return null;
}
Log.i("SharePlugin", "Intent contains streams to share");
ArrayList<Uri> uriList;
if (Intent.ACTION_SEND_MULTIPLE.equals(intent.getAction())) {
uriList = intent.getParcelableArrayListExtra(Intent.EXTRA_STREAM);
} else {
uriList = new ArrayList<>();
uriList.add(extras.getParcelable(Intent.EXTRA_STREAM));
}
uriList.removeAll(Collections.singleton(null));
if (uriList.isEmpty()) {
Log.w("SharePlugin", "All streams were null");
}
return uriList;
}
@Override