From c3af8fa30e302ffc14fbcfa89ce3ead1db8c6872 Mon Sep 17 00:00:00 2001
From: Nikita Dubrovsky <dubrovsky@google.com>
Date: Thu, 22 Oct 2020 15:10:59 -0700
Subject: [PATCH] Update demo app for the updated onReceiveContent() API

Bug: 170191676
Bug: 152068298
Test: Manual
Change-Id: Ic146edcf632dc25a0def62532eb53d866dbdc8ae
---
 .../OnReceiveContentCallbackAllTypes.java              |  9 ++-------
 .../receivecontent/OnReceiveContentCallbackImages.java | 10 +---------
 .../receivecontent/ReceiveContentDemoActivity.java     |  8 ++++++--
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/samples/ReceiveContentDemo/src/com/example/android/receivecontent/OnReceiveContentCallbackAllTypes.java b/samples/ReceiveContentDemo/src/com/example/android/receivecontent/OnReceiveContentCallbackAllTypes.java
index fbc406007..6a2810813 100644
--- a/samples/ReceiveContentDemo/src/com/example/android/receivecontent/OnReceiveContentCallbackAllTypes.java
+++ b/samples/ReceiveContentDemo/src/com/example/android/receivecontent/OnReceiveContentCallbackAllTypes.java
@@ -33,7 +33,6 @@ import android.widget.TextViewOnReceiveContentCallback;
 import android.widget.Toast;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Set;
 
 /**
@@ -42,15 +41,11 @@ import java.util.Set;
  * to the platform.
  */
 public class OnReceiveContentCallbackAllTypes extends TextViewOnReceiveContentCallback {
-    private static final Set<String> ALL_MIME_TYPES = Collections.singleton("*/*");
+    static final String[] SUPPORTED_MIME_TYPES = new String[] {"*/*"};
+
     private static final Set<String> SUPPORTED_CONTENT_URI_MIME_TYPES =
             new ArraySet<>(new String[] {"image/*", "video/mp4"});
 
-    @Override
-    public Set<String> getSupportedMimeTypes(TextView view) {
-        return ALL_MIME_TYPES;
-    }
-
     @Override
     public boolean onReceiveContent(TextView view, Payload payload) {
         ClipData clip = payload.getClip();
diff --git a/samples/ReceiveContentDemo/src/com/example/android/receivecontent/OnReceiveContentCallbackImages.java b/samples/ReceiveContentDemo/src/com/example/android/receivecontent/OnReceiveContentCallbackImages.java
index e2bdf2534..1b4a360fa 100644
--- a/samples/ReceiveContentDemo/src/com/example/android/receivecontent/OnReceiveContentCallbackImages.java
+++ b/samples/ReceiveContentDemo/src/com/example/android/receivecontent/OnReceiveContentCallbackImages.java
@@ -26,20 +26,12 @@ import android.view.OnReceiveContentCallback;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import java.util.Collections;
-import java.util.Set;
-
 /**
  * Sample implementation that accepts only images. All other content is deferred to default platform
  * behavior.
  */
 public class OnReceiveContentCallbackImages implements OnReceiveContentCallback<TextView> {
-    private static final Set<String> SUPPORTED_MIME_TYPES = Collections.singleton("image/*");
-
-    @Override
-    public Set<String> getSupportedMimeTypes(TextView view) {
-        return SUPPORTED_MIME_TYPES;
-    }
+    static final String[] SUPPORTED_MIME_TYPES = new String[] {"image/*"};
 
     @Override
     public boolean onReceiveContent(TextView view, Payload payload) {
diff --git a/samples/ReceiveContentDemo/src/com/example/android/receivecontent/ReceiveContentDemoActivity.java b/samples/ReceiveContentDemo/src/com/example/android/receivecontent/ReceiveContentDemoActivity.java
index d3dfbaeeb..f4b4c33d8 100644
--- a/samples/ReceiveContentDemo/src/com/example/android/receivecontent/ReceiveContentDemoActivity.java
+++ b/samples/ReceiveContentDemo/src/com/example/android/receivecontent/ReceiveContentDemoActivity.java
@@ -29,9 +29,13 @@ public class ReceiveContentDemoActivity extends Activity {
         setContentView(R.layout.demo);
 
         EditText editTextImagesOnly = findViewById(R.id.edittext_images);
-        editTextImagesOnly.setOnReceiveContentCallback(new OnReceiveContentCallbackImages());
+        editTextImagesOnly.setOnReceiveContentCallback(
+                OnReceiveContentCallbackImages.SUPPORTED_MIME_TYPES,
+                new OnReceiveContentCallbackImages());
 
         EditText editTextAllTypes = findViewById(R.id.edittext_all_types);
-        editTextAllTypes.setOnReceiveContentCallback(new OnReceiveContentCallbackAllTypes());
+        editTextAllTypes.setOnReceiveContentCallback(
+                OnReceiveContentCallbackAllTypes.SUPPORTED_MIME_TYPES,
+                new OnReceiveContentCallbackAllTypes());
     }
 }