From: Keith Packard Date: Thu, 5 Jan 2012 04:33:49 +0000 (-0800) Subject: altosdroid: Switch altosdroid build to ant X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=322a8560ff2b7f6847b11d14d6d7d93992ecdf95 altosdroid: Switch altosdroid build to ant The package builder only works inside ant Signed-off-by: Keith Packard --- diff --git a/altosdroid/.gitignore b/altosdroid/.gitignore new file mode 100644 index 00000000..e614fbbe --- /dev/null +++ b/altosdroid/.gitignore @@ -0,0 +1,2 @@ +bin +gen diff --git a/altosdroid/ant.properties b/altosdroid/ant.properties new file mode 100644 index 00000000..5c19441a --- /dev/null +++ b/altosdroid/ant.properties @@ -0,0 +1,21 @@ +# This file is used to override default values used by the Ant build system. +# +# This file must be checked in Version Control Systems, as it is +# integral to the build system of your project. + +# This file is only used by the Ant script. + +# You can use this to override default values such as +# 'source.dir' for the location of your java source folder and +# 'out.dir' for the location of your output folder. + +# You can also use it define how the release builds are signed by declaring +# the following properties: +# 'key.store' for the location of your keystore and +# 'key.alias' for the name of the key to use. +# The password will be asked during the build when you use the 'release' target. + +key.store=keystore +key.alias=bob +key.store.password=altusmetrum +key.alias.password=altusmetrum diff --git a/altosdroid/build.xml b/altosdroid/build.xml new file mode 100644 index 00000000..6a89edbe --- /dev/null +++ b/altosdroid/build.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/altosdroid/local.properties b/altosdroid/local.properties new file mode 100644 index 00000000..f46d5072 --- /dev/null +++ b/altosdroid/local.properties @@ -0,0 +1,10 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must *NOT* be checked in Version Control Systems, +# as it contains information specific to your local configuration. + +# location of the SDK. This is only used by Ant +# For customization when using a Version Control System, please read the +# header note. +sdk.dir=/home/keithp/src/android/android-sdk-linux diff --git a/altosdroid/project.properties b/altosdroid/project.properties new file mode 100644 index 00000000..0a80e644 --- /dev/null +++ b/altosdroid/project.properties @@ -0,0 +1,11 @@ +# 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 use, +# "ant.properties", and override values to adapt the script to your +# project structure. + +# Project target. +target=Google Inc.:Google APIs:10 diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java index 844ca39e..43a85748 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java @@ -217,6 +217,8 @@ public class AltosDroid extends Activity { // Get the message bytes and tell the BluetoothChatService to write byte[] send = message.getBytes(); mChatService.write(send); + byte[] newline = { '\n' }; + mChatService.write(newline); // Reset out string buffer to zero and clear the edit text field mOutStringBuffer.setLength(0); diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/BluetoothChatService.java b/altosdroid/src/org/altusmetrum/AltosDroid/BluetoothChatService.java index 93cb75de..03edeb93 100644 --- a/altosdroid/src/org/altusmetrum/AltosDroid/BluetoothChatService.java +++ b/altosdroid/src/org/altusmetrum/AltosDroid/BluetoothChatService.java @@ -236,15 +236,17 @@ public class BluetoothChatService { // Get a BluetoothSocket for a connection with the // given BluetoothDevice try { + Log.i(TAG, "Connect starting"); if (secure) { Method m = device.getClass().getMethod("createRfcommSocket", new Class[] {int.class}); - tmp = (BluetoothSocket) m.invoke(device, 2); + tmp = (BluetoothSocket) m.invoke(device, 1); // tmp = device.createRfcommSocket(1); } else { Method m = device.getClass().getMethod("createInsecureRfcommSocket", new Class[] {int.class}); - tmp = (BluetoothSocket) m.invoke(device, 2); + tmp = (BluetoothSocket) m.invoke(device, 1); // tmp = device.createInsecureRfcommSocket(1); } + Log.i(TAG, "Connect succeeded"); } catch (Exception e) { Log.e(TAG, "Socket Type: " + mSocketType + "create() failed", e); e.printStackTrace(); @@ -253,19 +255,21 @@ public class BluetoothChatService { } public void run() { - Log.i(TAG, "BEGIN mConnectThread SocketType:" + mSocketType); + Log.i(TAG, "BEGIN ya y a mConnectThread SocketType:" + mSocketType); setName("ConnectThread" + mSocketType); // Always cancel discovery because it will slow down a connection - mAdapter.cancelDiscovery(); +// mAdapter.cancelDiscovery(); // Make a connection to the BluetoothSocket try { // This is a blocking call and will only return on a // successful connection or an exception + Log.i(TAG, "CONNECT SocketType:" + mSocketType); mmSocket.connect(); } catch (IOException e) { // Close the socket + Log.e(TAG, "Connect failed", e); try { mmSocket.close(); } catch (IOException e2) { @@ -332,9 +336,12 @@ public class BluetoothChatService { // Read from the InputStream bytes = mmInStream.read(buffer); - // Send the obtained bytes to the UI Activity - mHandler.obtainMessage(AltosDroid.MESSAGE_READ, bytes, -1, buffer) + if (bytes > 0) { + Log.i(TAG, "Recv: " + new String(buffer, 0, bytes)); + // Send the obtained bytes to the UI Activity + mHandler.obtainMessage(AltosDroid.MESSAGE_READ, bytes, -1, buffer) .sendToTarget(); + } } catch (IOException e) { Log.e(TAG, "disconnected", e); connectionLost();