Update ContentInfo.partition to return a Pair instead of a Map

Bug: 174125311
Test: manual
Change-Id: Ibf8176abf2cfcf88912128c5bc729d408a00e56a
This commit is contained in:
Nikita Dubrovsky
2020-12-01 16:39:32 -08:00
parent 94185edfa8
commit 6cb00ae9db

View File

@@ -22,12 +22,11 @@ import static com.example.android.receivecontent.Utils.showMessage;
import android.content.ClipData; import android.content.ClipData;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.net.Uri; import android.net.Uri;
import android.util.Pair;
import android.view.ContentInfo; import android.view.ContentInfo;
import android.view.OnReceiveContentListener; import android.view.OnReceiveContentListener;
import android.view.View; import android.view.View;
import java.util.Map;
/** /**
* Sample implementation that accepts images, rejects other URIs, and delegates handling for all * Sample implementation that accepts images, rejects other URIs, and delegates handling for all
* non-URI content to the platform. * non-URI content to the platform.
@@ -37,14 +36,17 @@ public class MyListenerImages implements OnReceiveContentListener {
@Override @Override
public ContentInfo onReceiveContent(View view, ContentInfo payload) { public ContentInfo onReceiveContent(View view, ContentInfo payload) {
Map<Boolean, ContentInfo> split = payload.partition(item -> item.getUri() != null); Pair<ContentInfo, ContentInfo> split = payload.partition(
if (split.get(true) != null) { item -> item.getUri() != null);
ClipData clip = payload.getClip(); ContentInfo uriContent = split.first;
ContentInfo remaining = split.second;
if (uriContent != null) {
ClipData clip = uriContent.getClip();
for (int i = 0; i < clip.getItemCount(); i++) { for (int i = 0; i < clip.getItemCount(); i++) {
receive(view, clip.getItemAt(i).getUri()); receive(view, clip.getItemAt(i).getUri());
} }
} }
return split.get(false); return remaining;
} }
private static void receive(View view, Uri contentUri) { private static void receive(View view, Uri contentUri) {