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

Commit 1ed96d52 authored by Jake Hamby's avatar Jake Hamby
Browse files

Implement "show received files" intent for Settings. 

Add a handler for a new intent (sent from the Settings app) to
show all files received via Bluetooth. This is equivalent to the
now deprecated live folder view of received files.

Bug: 3167219
Change-Id: Ibb8d3738d62301af5b012489a69ac078e554b66d
parent c313dd80

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
            <intent-filter>

                <action android:name="android.bluetooth.adapter.action.STATE_CHANGED" />

                <action android:name="android.intent.action.BOOT_COMPLETED" />

                <action android:name="android.btopp.intent.action.OPEN_RECEIVED_FILES" />

            </intent-filter>

        </receiver>

        <activity android:name=".opp.BluetoothOppLauncherActivity"

res/menu/receivedfilescontextfinished.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- 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.

-->



<menu xmlns:android="http://schemas.android.com/apk/res/android">



    <item android:id="@+id/transfer_menu_open"

        android:title="@string/transfer_menu_open" />



</menu>

src/com/android/bluetooth/opp/BluetoothOppReceiver.java

+8 −0
Original line number Diff line number Diff line
@@ -182,6 +182,14 @@ public class BluetoothOppReceiver extends BroadcastReceiver { 
            in.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);

            in.putExtra("direction", BluetoothShare.DIRECTION_INBOUND);

            context.startActivity(in);

        } else if (action.equals(Constants.ACTION_OPEN_RECEIVED_FILES)) {

            if (V) Log.v(TAG, "Received ACTION_OPEN_RECEIVED_FILES.");



            Intent in = new Intent(context, BluetoothOppTransferHistory.class);

            in.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);

            in.putExtra("direction", BluetoothShare.DIRECTION_INBOUND);

            in.putExtra(Constants.EXTRA_SHOW_ALL_FILES, true);

            context.startActivity(in);

        } else if (action.equals(Constants.ACTION_HIDE)) {

            if (V) Log.v(TAG, "Receiver hide for " + intent.getData());

            Cursor cursor = context.getContentResolver().query(intent.getData(), null, null, null,

src/com/android/bluetooth/opp/BluetoothOppTransferHistory.java

+30 −10
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ public class BluetoothOppTransferHistory extends Activity implements 


    private int mContextMenuPosition;



    private boolean mShowAllIncoming;



    /** Class to handle Notification Manager updates */

    private BluetoothOppNotification mNotifier;
@@ -84,21 +86,34 @@ public class BluetoothOppTransferHistory extends Activity implements 
        mListView = (ListView)findViewById(R.id.list);

        mListView.setEmptyView(findViewById(R.id.empty));



        mShowAllIncoming = getIntent().getBooleanExtra(

                Constants.EXTRA_SHOW_ALL_FILES, false);



        String direction;

        int dir = getIntent().getIntExtra("direction", 0);

        if (dir == BluetoothShare.DIRECTION_OUTBOUND) {

            setTitle(getText(R.string.outbound_history_title));

            direction = "(" + BluetoothShare.DIRECTION + " == " + BluetoothShare.DIRECTION_OUTBOUND

                    + ")";

        } else {

            if (mShowAllIncoming) {

                setTitle(getText(R.string.btopp_live_folder));

            } else {

                setTitle(getText(R.string.inbound_history_title));

            }

            direction = "(" + BluetoothShare.DIRECTION + " == " + BluetoothShare.DIRECTION_INBOUND

                    + ")";

        }



        final String selection = BluetoothShare.STATUS + " >= '200' AND " + "("

                + BluetoothShare.VISIBILITY + " IS NULL OR " + BluetoothShare.VISIBILITY + " == '"

                + BluetoothShare.VISIBILITY_VISIBLE + "'" + ")" + " AND " + direction;

        String selection = BluetoothShare.STATUS + " >= '200' AND " + direction;



        if (!mShowAllIncoming) {

            selection = selection + " AND ("

                    + BluetoothShare.VISIBILITY + " IS NULL OR "

                    + BluetoothShare.VISIBILITY + " == '"

                    + BluetoothShare.VISIBILITY_VISIBLE + "')";

        }



        final String sortOrder = BluetoothShare.TIMESTAMP + " DESC";



        mTransferCursor = managedQuery(BluetoothShare.CONTENT_URI, new String[] {
@@ -125,7 +140,7 @@ public class BluetoothOppTransferHistory extends Activity implements 


    @Override

    public boolean onCreateOptionsMenu(Menu menu) {

        if (mTransferCursor != null) {

        if (mTransferCursor != null && !mShowAllIncoming) {

            MenuInflater inflater = getMenuInflater();

            inflater.inflate(R.menu.transferhistory, menu);

        }
@@ -134,8 +149,10 @@ public class BluetoothOppTransferHistory extends Activity implements 


    @Override

    public boolean onPrepareOptionsMenu(Menu menu) {

        if (!mShowAllIncoming) {

            boolean showClear = getClearableCount() > 0;

            menu.findItem(R.id.transfer_menu_clear_all).setEnabled(showClear);

        }

        return super.onPrepareOptionsMenu(menu);

    }
@@ -183,9 +200,13 @@ public class BluetoothOppTransferHistory extends Activity implements 
            menu.setHeaderTitle(fileName);



            MenuInflater inflater = getMenuInflater();

            if (mShowAllIncoming) {

                inflater.inflate(R.menu.receivedfilescontextfinished, menu);

            } else {

                inflater.inflate(R.menu.transferhistorycontextfinished, menu);

            }

        }

    }



    /**

     * Prompt the user if they would like to clear the transfer history
@@ -254,8 +275,7 @@ public class BluetoothOppTransferHistory extends Activity implements 
    private void openCompleteTransfer() {

        int sessionId = mTransferCursor.getInt(mIdColumnId);

        Uri contentUri = Uri.parse(BluetoothShare.CONTENT_URI + "/" + sessionId);

        BluetoothOppTransferInfo transInfo = new BluetoothOppTransferInfo();

        transInfo = BluetoothOppUtility.queryRecord(this, contentUri);

        BluetoothOppTransferInfo transInfo = BluetoothOppUtility.queryRecord(this, contentUri);

        if (transInfo == null) {

            Log.e(TAG, "Error: Can not get data from db");

            return;

src/com/android/bluetooth/opp/Constants.java

+6 −0
Original line number Diff line number Diff line
@@ -65,6 +65,12 @@ public class Constants { 
    /** the intent that gets sent when clicking a inbound transfer notification */

    public static final String ACTION_OPEN_INBOUND_TRANSFER = "android.btopp.intent.action.OPEN_INBOUND";



    /** the intent that gets sent from the Settings app to show the received files */

    public static final String ACTION_OPEN_RECEIVED_FILES = "android.btopp.intent.action.OPEN_RECEIVED_FILES";



    /** the intent extra to show all received files in the transfer history */

    public static final String EXTRA_SHOW_ALL_FILES = "android.btopp.intent.extra.SHOW_ALL";



    /** the intent that gets sent when clicking an incomplete/failed transfer */

    public static final String ACTION_LIST = "android.btopp.intent.action.LIST";