Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cf1ac7b authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove deprecated NFC beam support" am: 19df6070 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Contacts/+/2162117



Change-Id: Ib4ff8b61cffcc956906c5797d927dfb923f1642e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 577db3f7 19df6070

src/com/android/contacts/NfcHandler.java

deleted100644 → 0
+0 −102
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2011 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.contacts;



import android.app.Activity;

import android.content.ContentResolver;

import android.content.Context;

import android.net.Uri;

import android.nfc.NdefMessage;

import android.nfc.NdefRecord;

import android.nfc.NfcAdapter;

import android.nfc.NfcEvent;

import android.provider.ContactsContract.Contacts;

import android.provider.ContactsContract.Profile;

import android.util.Log;



import java.io.ByteArrayOutputStream;

import java.io.IOException;

import java.io.InputStream;



/**

  * This class implements sharing the currently displayed

  * contact to another device using NFC. NFC sharing is only

  * enabled when the activity is in the foreground and resumed.

  * When an NFC link is established, {@link #createMessage}

  * will be called to create the data to be sent over the link,

  * which is a vCard in this case.

  */

public class NfcHandler implements NfcAdapter.CreateNdefMessageCallback {



    private static final String TAG = "ContactNfcHandler";

    private static final String PROFILE_LOOKUP_KEY = "profile";

    private final Context mContext;

    private final Uri mContactUri;



    /* Register NFC handler. This should be called in activities' onCreate(), or similar methods */

    public static void register(Activity activity, Uri contactUri) {

        NfcAdapter adapter = NfcAdapter.getDefaultAdapter(activity.getApplicationContext());

        if (adapter == null) {

            return;  // NFC not available on this device

        }

        adapter.setNdefPushMessageCallback(new NfcHandler(activity, contactUri), activity);

    }



    public NfcHandler(Context context, Uri contactUri) {

        mContext = context;

        mContactUri = contactUri;

    }



    @Override

    public NdefMessage createNdefMessage(NfcEvent event) {

        ContentResolver resolver = mContext.getContentResolver();

        if (mContactUri != null) {

            final String lookupKey = Uri.encode(mContactUri.getPathSegments().get(2));

            final Uri shareUri;

            // TODO find out where to get this constant from, or find another way

            // of determining this.

            if (lookupKey.equals(PROFILE_LOOKUP_KEY)) {

                shareUri = Profile.CONTENT_VCARD_URI.buildUpon().

                appendQueryParameter(Contacts.QUERY_PARAMETER_VCARD_NO_PHOTO, "true").

                build();

            } else {

                shareUri = Contacts.CONTENT_VCARD_URI.buildUpon().

                appendPath(lookupKey).

                appendQueryParameter(Contacts.QUERY_PARAMETER_VCARD_NO_PHOTO, "true").

                build();

            }

            ByteArrayOutputStream ndefBytes = new ByteArrayOutputStream();

            byte[] buffer = new byte[1024];

            int r;

            try {

                InputStream vcardInputStream = resolver.openInputStream(shareUri);

                while ((r = vcardInputStream.read(buffer)) > 0) {

                    ndefBytes.write(buffer, 0, r);

                }



                NdefRecord record = NdefRecord.createMime("text/x-vcard", ndefBytes.toByteArray());

                return new NdefMessage(record);

            } catch (IOException e) {

                Log.e(TAG, "IOException creating vcard.");

                return null;

            }

        } else {

            Log.w(TAG, "No contact URI to share.");

            return null;

        }

    }

}

src/com/android/contacts/quickcontact/QuickContactActivity.java

+0 −2
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ import com.android.contacts.ContactSaveService; 
import com.android.contacts.ContactsActivity;

import com.android.contacts.ContactsUtils;

import com.android.contacts.DynamicShortcuts;

import com.android.contacts.NfcHandler;

import com.android.contacts.R;

import com.android.contacts.ShortcutIntentBuilder;

import com.android.contacts.ShortcutIntentBuilder.OnShortcutIntentCreatedListener;
@@ -990,7 +989,6 @@ public class QuickContactActivity extends ContactsActivity { 
            }

        };

        mEntriesAndActionsTask.execute();

        NfcHandler.register(this, mContactData.getLookupUri());

    }



    private void bindDataToCards(Cp2DataCardModel cp2DataCardModel) {