Mercurial > party-buddy

changeset 9:5845b8b5d078

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some more crap code
author Michal Kawalec <mkawalec@lavabit.com>
date Sat, 01 Jun 2013 19:10:46 +0200
parents 4dd13ff170dd
children 4bdaee2d6b44
files AndroidManifest.xml assets/www/index.html bin/AndroidManifest.xml bin/build.prop bin/partybuddy-debug-unaligned.apk bin/partybuddy-debug.apk bin/partybuddy.ap_ bin/proguard.txt
diffstat 8 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/AndroidManifest.xml	Sat Jun 01 18:55:23 2013 +0200
+++ b/AndroidManifest.xml	Sat Jun 01 19:10:46 2013 +0200
@@ -29,6 +29,8 @@
         />
 
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
--- a/assets/www/index.html	Sat Jun 01 18:55:23 2013 +0200
+++ b/assets/www/index.html	Sat Jun 01 19:10:46 2013 +0200
@@ -35,7 +35,7 @@
     //
     function onDeviceReady() {
         plugin = window.plugins.bluetooth;
-        plugin.listDevices(null,
+        plugin.enableBT(null,
                 function(r){console.log(r)},
                 function(e){console.log(e)}
                 );
@@ -43,6 +43,10 @@
                 function(r){console.log(r)},
                 function(e){console.log(e)}
                 );
+        plugin.listDevices(null,
+                function(r){console.log(r)},
+                function(e){console.log(e)}
+                );
 
         cordova.exec(sucCallback, failCallback, 'BluetoothPlugin', 'listDevices', [null]);
     }
--- a/bin/AndroidManifest.xml	Sat Jun 01 18:55:23 2013 +0200
+++ b/bin/AndroidManifest.xml	Sat Jun 01 19:10:46 2013 +0200
@@ -29,6 +29,8 @@
         />
 
     <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
--- a/bin/build.prop	Sat Jun 01 18:55:23 2013 +0200
+++ b/bin/build.prop	Sat Jun 01 19:10:46 2013 +0200
@@ -1,5 +1,5 @@
 #Last build type
-#Sat, 01 Jun 2013 18:52:22 +0200
+#Sat, 01 Jun 2013 19:09:01 +0200
 
 build.last.target=debug
 
Binary file bin/partybuddy-debug-unaligned.apk has changed
Binary file bin/partybuddy-debug.apk has changed
Binary file bin/partybuddy.ap_ has changed
--- a/bin/proguard.txt	Sat Jun 01 18:55:23 2013 +0200
+++ b/bin/proguard.txt	Sat Jun 01 19:10:46 2013 +0200
@@ -1,3 +1,3 @@
-# view AndroidManifest.xml #generated:52
+# view AndroidManifest.xml #generated:54
 -keep class com.nigmalabs.partybuddy.partybuddy { <init>(...); }