Author: kmorin Date: 2014-03-03 13:45:57 +0100 (Mon, 03 Mar 2014) New Revision: 61 Url: http://forge.codelutin.com/projects/wlo/repository/revisions/61 Log: fix bug when the user selects the item "No appaired device" in the device list Added: trunk/res/layout/device_list.xml trunk/src/fr/ifremer/wlo/utils/UpdateCheckTask.java Modified: trunk/src/fr/ifremer/wlo/DeviceListActivity.java Added: trunk/res/layout/device_list.xml =================================================================== --- trunk/res/layout/device_list.xml (rev 0) +++ trunk/res/layout/device_list.xml 2014-03-03 12:45:57 UTC (rev 61) @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <ListView android:id="@android:id/list" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + <TextView android:id="@android:id/empty" + android:text="@string/devices_none_paired" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="5dp" + android:textSize="18sp" + android:textStyle="italic"/> + +</FrameLayout> \ No newline at end of file Modified: trunk/src/fr/ifremer/wlo/DeviceListActivity.java =================================================================== --- trunk/src/fr/ifremer/wlo/DeviceListActivity.java 2014-03-02 19:42:31 UTC (rev 60) +++ trunk/src/fr/ifremer/wlo/DeviceListActivity.java 2014-03-03 12:45:57 UTC (rev 61) @@ -56,6 +56,7 @@ import android.os.RemoteException; import android.util.Log; import android.view.View; +import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.AdapterView.OnItemClickListener; import android.widget.ArrayAdapter; @@ -91,39 +92,15 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - // Initialize the button to perform device discovery -// Button scanButton = (Button) findViewById(R.id.button_scan); -// scanButton.setOnClickListener(new OnClickListener() { -// public void onClick(View v) { -// doDiscovery(); -// v.setVisibility(View.GONE); -// } -// }); + setContentView(R.layout.device_list); - // Initialize array adapters. One for already paired devices and - // one for newly discovered devices mPairedDevicesArrayAdapter = new ArrayAdapter<String>(this, R.layout.device_name); -// mNewDevicesArrayAdapter = new ArrayAdapter<String>(this, R.layout.device_name); // Find and set up the ListView for paired devices -// ListView pairedListView = (ListView) findViewById(R.id.paired_devices); ListView pairedListView = getListView(); pairedListView.setAdapter(mPairedDevicesArrayAdapter); pairedListView.setOnItemClickListener(mDeviceClickListener); - // Find and set up the ListView for newly discovered devices -// ListView newDevicesListView = (ListView) findViewById(R.id.new_devices); -// newDevicesListView.setAdapter(mNewDevicesArrayAdapter); -// newDevicesListView.setOnItemClickListener(mDeviceClickListener); - - // Register for broadcasts when a device is discovered -// IntentFilter filter = new IntentFilter(BluetoothDevice.ACTION_FOUND); -// this.registerReceiver(mReceiver, filter); - - // Register for broadcasts when discovery has finished -// filter = new IntentFilter(BluetoothAdapter.ACTION_DISCOVERY_FINISHED); -// this.registerReceiver(mReceiver, filter); - // Get the local Bluetooth adapter mBtAdapter = BluetoothAdapter.getDefaultAdapter(); @@ -132,13 +109,9 @@ // If there are paired devices, add each one to the ArrayAdapter if (pairedDevices.size() > 0) { -// findViewById(R.id.title_paired_devices).setVisibility(View.VISIBLE); for (BluetoothDevice device : pairedDevices) { mPairedDevicesArrayAdapter.add(device.getName() + "\n" + device.getAddress()); } - } else { - String noDevices = getResources().getText(R.string.devices_none_paired).toString(); - mPairedDevicesArrayAdapter.add(noDevices); } bindService(new Intent(this, BigFinCommunicationService.class), this, Context.BIND_AUTO_CREATE); @@ -153,32 +126,9 @@ mBtAdapter.cancelDiscovery(); } - // Unregister broadcast listeners -// this.unregisterReceiver(mReceiver); doUnbindService(); } - /** - * Start device discover with the BluetoothAdapter - */ -// private void doDiscovery() { -// Log.d(TAG, "doDiscovery()"); -// -// // Indicate scanning in the title -// setProgressBarIndeterminateVisibility(true); -// setTitle(R.string.scanning); -// -// // Turn on sub-title for new devices -// findViewById(R.id.title_new_devices).setVisibility(View.VISIBLE); -// -// // If we're already discovering, stop it -// if (mBtAdapter.isDiscovering()) { -// mBtAdapter.cancelDiscovery(); -// } -// -// // Request discover from BluetoothAdapter -// mBtAdapter.startDiscovery(); -// } /** * Un-bind this Activity to MyService @@ -227,10 +177,6 @@ String info = ((TextView) v).getText().toString(); String address = info.substring(info.length() - 17); - // Create the result Intent and include the MAC address -// Intent intent = new Intent(); -// intent.putExtra(EXTRA_DEVICE_ADDRESS, address); - // Attempt to connect to the device Message message = Message.obtain(null, BigFinCommunicationService.MESSAGE_CONNECT_DEVICE); Bundle bundle = new Bundle(); @@ -243,39 +189,9 @@ Log.e(TAG, "Error while sending data to the service"); } - // Set result and finish this Activity -// setResult(Activity.RESULT_OK, intent); -// finish(); } }; - // The BroadcastReceiver that listens for discovered devices and - // changes the title when discovery is finished -// private final BroadcastReceiver mReceiver = new BroadcastReceiver() { -// @Override -// public void onReceive(Context context, Intent intent) { -// String action = intent.getAction(); -// -// // When discovery finds a device -// if (BluetoothDevice.ACTION_FOUND.equals(action)) { -// // Get the BluetoothDevice object from the Intent -// BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE); -// // If it's already paired, skip it, because it's been listed already -// if (device.getBondState() != BluetoothDevice.BOND_BONDED) { -// mNewDevicesArrayAdapter.add(device.getName() + "\n" + device.getAddress()); -// } -// // When discovery is finished, change the Activity title -// } else if (BluetoothAdapter.ACTION_DISCOVERY_FINISHED.equals(action)) { -// setProgressBarIndeterminateVisibility(false); -// setTitle(R.string.select_device); -// if (mNewDevicesArrayAdapter.getCount() == 0) { -// String noDevices = getResources().getText(R.string.none_found).toString(); -// mNewDevicesArrayAdapter.add(noDevices); -// } -// } -// } -// }; - protected void sendDataToDevice(String data) { Message message = Message.obtain(null, BigFinCommunicationService.MESSAGE_SEND_DATA); Bundle bundle = new Bundle(); Added: trunk/src/fr/ifremer/wlo/utils/UpdateCheckTask.java =================================================================== --- trunk/src/fr/ifremer/wlo/utils/UpdateCheckTask.java (rev 0) +++ trunk/src/fr/ifremer/wlo/utils/UpdateCheckTask.java 2014-03-03 12:45:57 UTC (rev 61) @@ -0,0 +1,18 @@ +package fr.ifremer.wlo.utils; + +import android.os.AsyncTask; + +import java.net.URL; + +/** + * @author Kevin Morin (Code Lutin) + * @since x.x + */ +public class UpdateCheckTask extends AsyncTask<URL, Integer, Long> { + + @Override + protected Long doInBackground(URL... params) { + + return null; + } +}