Update version and GDK

kurtisnelson · Oct 14, 2014 · 6e59b16 · 6e59b16
1 parent 54c55a8
commit 6e59b16
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/WearScript/build.gradle b/WearScript/build.gradle
@@ -16,15 +16,15 @@ repositories {
 }
 
 android {
-    compileSdkVersion 19
+    compileSdkVersion "Google Inc.:Glass Development Kit Preview:19"
     buildToolsVersion "20.0.0"
 
     defaultConfig {
         applicationId "com.dappervision.wearscript"
         minSdkVersion 19
         targetSdkVersion 19
         versionCode 2
-        versionName "0.3.0"
+        versionName "0.4.1"
     }
     lintOptions {
         abortOnError false
@@ -40,7 +40,6 @@ dependencies {
     compile 'com.radiusnetworks:AndroidIBeaconLibrary:0.7.6@aar'
     compile files('libs/android-websockets.jar')
     compile files('libs/commons-codec-1.6.jar')
-    compile files('libs/gdk.jar')
     compile files('libs/java_websocket.jar')
     compile files('libs/json-simple-1.1.1.jar')
     compile files('libs/msgpack-0.6.9-SNAPSHOT.jar')

diff --git a/WearScript/src/main/java/com/dappervision/wearscript/managers/CameraManager.java b/WearScript/src/main/java/com/dappervision/wearscript/managers/CameraManager.java
@@ -19,6 +19,7 @@
 import com.dappervision.wearscript.events.OpenCVLoadEvent;
 import com.dappervision.wearscript.events.OpenCVLoadedEvent;
 import com.dappervision.wearscript.events.StartActivityEvent;
+import com.google.android.glass.content.Intents;
 
 import org.opencv.core.CvType;
 import org.opencv.core.Mat;
@@ -131,8 +132,8 @@ public void onEventBackgroundThread(ActivityResultEvent event) {
         Log.d(TAG, "Got request code: " + requestCode);
         if (requestCode == 1000) {
             if (resultCode == Activity.RESULT_OK) {
-                final String pictureFilePath = intent.getStringExtra(com.google.android.glass.media.CameraManager.EXTRA_PICTURE_FILE_PATH);
-                String thumbnailFilePath = intent.getStringExtra(com.google.android.glass.media.CameraManager.EXTRA_THUMBNAIL_FILE_PATH);
+                final String pictureFilePath = intent.getStringExtra(Intents.EXTRA_PICTURE_FILE_PATH);
+                String thumbnailFilePath = intent.getStringExtra(Intents.EXTRA_THUMBNAIL_FILE_PATH);
                 Log.d(TAG, "CameraManager: " + jsCallbacks.toString());
                 if (jsCallbacks.containsKey(PHOTO) || jsCallbacks.containsKey(PHOTO_PATH)) {
                     // create empty file if it doesn't exist
@@ -205,8 +206,8 @@ public void run() {
                 stateChange();
             }
             if (resultCode == Activity.RESULT_OK) {
-                String thumbnailFilePath = intent.getStringExtra(com.google.android.glass.media.CameraManager.EXTRA_THUMBNAIL_FILE_PATH);
-                String videoFilePath = intent.getStringExtra(com.google.android.glass.media.CameraManager.EXTRA_VIDEO_FILE_PATH);
+                String thumbnailFilePath = intent.getStringExtra(Intents.EXTRA_THUMBNAIL_FILE_PATH);
+                String videoFilePath = intent.getStringExtra(Intents.EXTRA_VIDEO_FILE_PATH);
                 if (jsCallbacks.containsKey(VIDEO_PATH)) {
                     makeCall(VIDEO_PATH, "'" + videoFilePath + "'");
                     jsCallbacks.remove(VIDEO_PATH);