diff --git a/build.gradle b/build.gradle index 76f346d..b094e1b 100644 --- a/build.gradle +++ b/build.gradle @@ -10,7 +10,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.1.0' + classpath 'com.android.tools.build:gradle:1.2.3' } } diff --git a/library/project.properties b/library/project.properties deleted file mode 100644 index 91d2b02..0000000 --- a/library/project.properties +++ /dev/null @@ -1,15 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=android-19 -android.library=true diff --git a/library/src/main/java/uk/co/alt236/bluetoothlelib/device/adrecord/AdRecord.java b/library/src/main/java/uk/co/alt236/bluetoothlelib/device/adrecord/AdRecord.java index 2db5558..64f67d5 100644 --- a/library/src/main/java/uk/co/alt236/bluetoothlelib/device/adrecord/AdRecord.java +++ b/library/src/main/java/uk/co/alt236/bluetoothlelib/device/adrecord/AdRecord.java @@ -12,7 +12,6 @@ import android.os.Parcelable; * Expanded by Alexandros Schillings */ public final class AdRecord implements Parcelable{ - // 02 # Number of bytes that follow in first AD structure // 01 # Flags AD type // 1A # Flags value 0x1A = 000011010 diff --git a/library/src/main/java/uk/co/alt236/bluetoothlelib/device/mfdata/IBeaconManufacturerData.java b/library/src/main/java/uk/co/alt236/bluetoothlelib/device/mfdata/IBeaconManufacturerData.java index 4fbd088..34cb7fa 100644 --- a/library/src/main/java/uk/co/alt236/bluetoothlelib/device/mfdata/IBeaconManufacturerData.java +++ b/library/src/main/java/uk/co/alt236/bluetoothlelib/device/mfdata/IBeaconManufacturerData.java @@ -126,7 +126,7 @@ public final class IBeaconManufacturerData { } private static String calculateUUIDString(final byte[] uuid){ - final StringBuffer sb = new StringBuffer(); + final StringBuilder sb = new StringBuilder(); for(int i = 0 ; i< uuid.length; i++){ if(i == 4){sb.append('-');} diff --git a/library/src/main/java/uk/co/alt236/bluetoothlelib/util/AdRecordUtils.java b/library/src/main/java/uk/co/alt236/bluetoothlelib/util/AdRecordUtils.java index c66c9f4..07233c4 100644 --- a/library/src/main/java/uk/co/alt236/bluetoothlelib/util/AdRecordUtils.java +++ b/library/src/main/java/uk/co/alt236/bluetoothlelib/util/AdRecordUtils.java @@ -14,7 +14,7 @@ import android.util.SparseArray; public class AdRecordUtils { public static String getRecordDataAsString(final AdRecord nameRecord) { - if(nameRecord == null){return new String();} + if(nameRecord == null){return "";} return new String(nameRecord.getData()); } diff --git a/library/src/main/java/uk/co/alt236/bluetoothlelib/util/ByteUtils.java b/library/src/main/java/uk/co/alt236/bluetoothlelib/util/ByteUtils.java index 226d11e..6b027f5 100644 --- a/library/src/main/java/uk/co/alt236/bluetoothlelib/util/ByteUtils.java +++ b/library/src/main/java/uk/co/alt236/bluetoothlelib/util/ByteUtils.java @@ -16,7 +16,7 @@ public class ByteUtils { * @return the string */ public static String byteArrayToHexString(final byte[] array){ - final StringBuffer sb = new StringBuffer(); + final StringBuilder sb = new StringBuilder(); boolean firstEntry = true; sb.append('['); diff --git a/library/src/main/java/uk/co/alt236/bluetoothlelib/util/IBeaconUtils.java b/library/src/main/java/uk/co/alt236/bluetoothlelib/util/IBeaconUtils.java index 7343809..9ff4952 100644 --- a/library/src/main/java/uk/co/alt236/bluetoothlelib/util/IBeaconUtils.java +++ b/library/src/main/java/uk/co/alt236/bluetoothlelib/util/IBeaconUtils.java @@ -65,7 +65,7 @@ public class IBeaconUtils { * Ascertains whether a Manufacturer Data byte array belongs to an iBeacon; * * @param manufacturerData a Bluetooth LE device's raw manufacturerData. - * @return + * @return true if the manufacturer data belong to an iBeacon */ public static boolean isThisAnIBeacon(final byte[] manufacturerData){ if(manufacturerData == null){return false;} diff --git a/sample_app/project.properties b/sample_app/project.properties deleted file mode 100644 index 3a06472..0000000 --- a/sample_app/project.properties +++ /dev/null @@ -1,15 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system edit -# "ant.properties", and override values to adapt the script to your -# project structure. -# -# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): -#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt - -# Project target. -target=Google Inc.:Google APIs:19 -android.library.reference.1=../library diff --git a/sample_app/src/main/java/uk/co/alt236/btlescan/activities/DeviceControlActivity.java b/sample_app/src/main/java/uk/co/alt236/btlescan/activities/DeviceControlActivity.java index bd0063b..40c0dd5 100644 --- a/sample_app/src/main/java/uk/co/alt236/btlescan/activities/DeviceControlActivity.java +++ b/sample_app/src/main/java/uk/co/alt236/btlescan/activities/DeviceControlActivity.java @@ -76,7 +76,6 @@ public class DeviceControlActivity extends Activity { private boolean mConnected = false; private String mExportString; - private BluetoothLeDevice mDevice; // Code to manage Service lifecycle. private final ServiceConnection mServiceConnection = new ServiceConnection() { @@ -280,9 +279,9 @@ public class DeviceControlActivity extends Activity { setContentView(R.layout.activity_gatt_services); final Intent intent = getIntent(); - mDevice = intent.getParcelableExtra(EXTRA_DEVICE); - mDeviceName = mDevice.getName(); - mDeviceAddress = mDevice.getAddress(); + final BluetoothLeDevice device = intent.getParcelableExtra(EXTRA_DEVICE); + mDeviceName = device.getName(); + mDeviceAddress = device.getAddress(); ButterKnife.inject(this); diff --git a/sample_app/src/main/java/uk/co/alt236/btlescan/activities/DeviceDetailsActivity.java b/sample_app/src/main/java/uk/co/alt236/btlescan/activities/DeviceDetailsActivity.java index 343e113..4a7457e 100644 --- a/sample_app/src/main/java/uk/co/alt236/btlescan/activities/DeviceDetailsActivity.java +++ b/sample_app/src/main/java/uk/co/alt236/btlescan/activities/DeviceDetailsActivity.java @@ -77,7 +77,7 @@ public class DeviceDetailsActivity extends ListActivity{ CompanyIdentifierResolver.getCompanyName(iBeaconData.getCompanyIdentifier(), getString(R.string.unknown)) + " (" + hexEncode(iBeaconData.getCompanyIdentifier()) + ")"); tvAdvert.setText(iBeaconData.getIBeaconAdvertisement() + " (" + hexEncode( iBeaconData.getIBeaconAdvertisement() ) + ")"); - tvUUID.setText(iBeaconData.getUUID().toString()); + tvUUID.setText(iBeaconData.getUUID()); tvMajor.setText(iBeaconData.getMajor() + " (" + hexEncode( iBeaconData.getMajor() ) + ")"); tvMinor.setText(iBeaconData.getMinor() + " (" + hexEncode( iBeaconData.getMinor() ) + ")"); tvTxPower.setText(iBeaconData.getCalibratedTxPower() + " (" + hexEncode( iBeaconData.getCalibratedTxPower() ) + ")"); diff --git a/sample_app/src/main/java/uk/co/alt236/btlescan/activities/MainActivity.java b/sample_app/src/main/java/uk/co/alt236/btlescan/activities/MainActivity.java index 18b203e..b8e4749 100644 --- a/sample_app/src/main/java/uk/co/alt236/btlescan/activities/MainActivity.java +++ b/sample_app/src/main/java/uk/co/alt236/btlescan/activities/MainActivity.java @@ -35,7 +35,7 @@ public class MainActivity extends ListActivity { private LeDeviceListAdapter mLeDeviceListAdapter; private BluetoothLeDeviceStore mDeviceStore; - private BluetoothAdapter.LeScanCallback mLeScanCallback = new BluetoothAdapter.LeScanCallback() { + private final BluetoothAdapter.LeScanCallback mLeScanCallback = new BluetoothAdapter.LeScanCallback() { @Override public void onLeScan(final BluetoothDevice device, final int rssi, final byte[] scanRecord) { @@ -121,10 +121,9 @@ public class MainActivity extends ListActivity { @Override protected void onListItemClick(final ListView l, final View v, final int position, final long id) { - final BluetoothLeDevice device = (BluetoothLeDevice) mLeDeviceListAdapter.getItem(position); + final BluetoothLeDevice device = mLeDeviceListAdapter.getItem(position); if (device == null) return; - final Intent intent = new Intent(this, DeviceDetailsActivity.class); intent.putExtra(DeviceDetailsActivity.EXTRA_DEVICE, device); diff --git a/sample_app/src/main/java/uk/co/alt236/btlescan/adapters/LeDeviceListAdapter.java b/sample_app/src/main/java/uk/co/alt236/btlescan/adapters/LeDeviceListAdapter.java index b8b415f..ecbdf08 100644 --- a/sample_app/src/main/java/uk/co/alt236/btlescan/adapters/LeDeviceListAdapter.java +++ b/sample_app/src/main/java/uk/co/alt236/btlescan/adapters/LeDeviceListAdapter.java @@ -57,7 +57,7 @@ public class LeDeviceListAdapter extends SimpleCursorAdapter { viewHolder.ibeaconDistance = (TextView) view.findViewById(R.id.ibeacon_distance); viewHolder.ibeaconUUID = (TextView) view.findViewById(R.id.ibeacon_uuid); viewHolder.ibeaconTxPower = (TextView) view.findViewById(R.id.ibeacon_tx_power); - viewHolder.ibeaconSection = (View) view.findViewById(R.id.ibeacon_section); + viewHolder.ibeaconSection = view.findViewById(R.id.ibeacon_section); viewHolder.ibeaconDistanceDescriptor = (TextView) view.findViewById(R.id.ibeacon_distance_descriptor); view.setTag(viewHolder); } else { diff --git a/sample_app/src/main/java/uk/co/alt236/btlescan/containers/BluetoothLeDeviceStore.java b/sample_app/src/main/java/uk/co/alt236/btlescan/containers/BluetoothLeDeviceStore.java index 9263187..72987b8 100644 --- a/sample_app/src/main/java/uk/co/alt236/btlescan/containers/BluetoothLeDeviceStore.java +++ b/sample_app/src/main/java/uk/co/alt236/btlescan/containers/BluetoothLeDeviceStore.java @@ -44,7 +44,7 @@ public class BluetoothLeDeviceStore { } - private FileWriter generateFile(final File file, final String contents){ + private static FileWriter generateFile(final File file, final String contents){ FileWriter writer = null; try { writer = new FileWriter(file); diff --git a/sample_app/src/main/java/uk/co/alt236/btlescan/util/BluetoothUtils.java b/sample_app/src/main/java/uk/co/alt236/btlescan/util/BluetoothUtils.java index ac1a586..71c8667 100644 --- a/sample_app/src/main/java/uk/co/alt236/btlescan/util/BluetoothUtils.java +++ b/sample_app/src/main/java/uk/co/alt236/btlescan/util/BluetoothUtils.java @@ -10,14 +10,13 @@ import android.content.pm.PackageManager; public final class BluetoothUtils { private final Activity mActivity; private final BluetoothAdapter mBluetoothAdapter; - private final BluetoothManager mBluetoothManager; - + public final static int REQUEST_ENABLE_BT = 2001; public BluetoothUtils(final Activity activity){ mActivity = activity; - mBluetoothManager = (BluetoothManager) mActivity.getSystemService(Context.BLUETOOTH_SERVICE); - mBluetoothAdapter = mBluetoothManager.getAdapter(); + final BluetoothManager btManager = (BluetoothManager) mActivity.getSystemService(Context.BLUETOOTH_SERVICE); + mBluetoothAdapter = btManager.getAdapter(); } public void askUserToEnableBluetoothIfNeeded(){