Started working on integrating Azure to transfer pictures from Glass …

…to Phone. (it isn't cooperating at them moment)
w9jds · Dec 13, 2013 · 2907cd3 · 2907cd3
1 parent 240d997
commit 2907cd3
Show file tree

Hide file tree

Showing 27 changed files with 384 additions and 359 deletions.
diff --git a/.idea/libraries/google_play_services.xml b/.idea/libraries/google_play_services.xml
diff --git a/.idea/libraries/gson_2_1.xml b/.idea/libraries/gson_2_1.xml
diff --git a/.idea/libraries/gson_2_2_2.xml b/.idea/libraries/gson_2_2_2.xml
diff --git a/.idea/libraries/mobileservices_1_1_0.xml b/.idea/libraries/mobileservices_1_1_0.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/GlassShare.iml b/GlassShare.iml
@@ -22,14 +22,14 @@
     <orderEntry type="library" exported="" name="google-http-client-gson-1.17.0-rc" level="project" />
     <orderEntry type="library" exported="" name="google-oauth-client-1.17.0-rc" level="project" />
     <orderEntry type="library" exported="" name="google-api-services-drive-v2-rev108-1.17.0-rc" level="project" />
-    <orderEntry type="library" exported="" name="gson-2.1" level="project" />
     <orderEntry type="library" exported="" name="jackson-core-2.1.3" level="project" />
     <orderEntry type="library" exported="" name="jackson-core-asl-1.9.11" level="project" />
     <orderEntry type="library" exported="" name="jsr305-1.3.9" level="project" />
     <orderEntry type="library" exported="" name="protobuf-java-2.4.1" level="project" />
-    <orderEntry type="library" exported="" name="google-play-services" level="project" />
     <orderEntry type="module" module-name="FacebookSDK" exported="" />
     <orderEntry type="library" exported="" name="google-api-services-plus-v1-rev111-1.16.0-rc" level="project" />
+    <orderEntry type="library" exported="" name="mobileservices-1.1.0" level="project" />
+    <orderEntry type="library" exported="" name="gson-2.2.2" level="project" />
   </component>
 </module>
 
diff --git a/out/production/GlassShare/GlassShare.apk b/out/production/GlassShare/GlassShare.apk
diff --git a/out/production/GlassShare/GlassShare.unaligned.apk b/out/production/GlassShare/GlassShare.unaligned.apk
diff --git a/out/production/GlassShare/com/w9jds/glassshare/Classes/ImageItem.class b/out/production/GlassShare/com/w9jds/glassshare/Classes/ImageItem.class
diff --git a/out/production/GlassShare/com/w9jds/glassshare/MainActivity$1.class b/out/production/GlassShare/com/w9jds/glassshare/MainActivity$1.class
diff --git a/out/production/GlassShare/com/w9jds/glassshare/MainActivity$3.class b/out/production/GlassShare/com/w9jds/glassshare/MainActivity$3.class
diff --git a/out/production/GlassShare/com/w9jds/glassshare/MainActivity$insertImage$1.class b/out/production/GlassShare/com/w9jds/glassshare/MainActivity$insertImage$1.class
diff --git a/out/production/GlassShare/com/w9jds/glassshare/MainActivity$insertImage.class b/out/production/GlassShare/com/w9jds/glassshare/MainActivity$insertImage.class
diff --git a/out/production/GlassShare/com/w9jds/glassshare/MainActivity.class b/out/production/GlassShare/com/w9jds/glassshare/MainActivity.class
diff --git a/out/production/GlassShare/com/w9jds/glassshare/R$id.class b/out/production/GlassShare/com/w9jds/glassshare/R$id.class
diff --git a/out/production/GlassShare/com/w9jds/glassshare/R$integer.class b/out/production/GlassShare/com/w9jds/glassshare/R$integer.class
diff --git a/out/production/GlassShare/com/w9jds/glassshare/R$layout.class b/out/production/GlassShare/com/w9jds/glassshare/R$layout.class
diff --git a/out/production/GlassShare/com/w9jds/glassshare/R$menu.class b/out/production/GlassShare/com/w9jds/glassshare/R$menu.class
diff --git a/out/production/GlassShare/com/w9jds/glassshare/R$string.class b/out/production/GlassShare/com/w9jds/glassshare/R$string.class
diff --git a/out/production/GlassShare/com/w9jds/glassshare/R$style.class b/out/production/GlassShare/com/w9jds/glassshare/R$style.class
diff --git a/out/production/GlassShare/com/w9jds/glassshare/R$styleable.class b/out/production/GlassShare/com/w9jds/glassshare/R$styleable.class
diff --git a/out/production/GlassShare/com/w9jds/glassshare/R$xml.class b/out/production/GlassShare/com/w9jds/glassshare/R$xml.class
diff --git a/res/menu/main.xml b/res/menu/main.xml
@@ -1,25 +1,25 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 
-   	<item
-	    android:id="@+id/share_menu_item"
-	    android:title="@string/share"
-	    android:icon="@drawable/ic_share_50" />
+   	<!--<item-->
+	    <!--android:id="@+id/share_menu_item"-->
+	    <!--android:title="@string/share"-->
+	    <!--android:icon="@drawable/ic_share_50" />-->
+
+    <!--<item-->
+        <!--android:id="@+id/upload_menu_item"-->
+        <!--android:title="@string/upload"-->
+        <!--android:icon="@drawable/ic_archive_50" />-->
 
     <item
-        android:id="@+id/upload_menu_item"
-        android:title="@string/upload"
+        android:id="@+id/uploadphone_menu_item"
+        android:title="@string/uploadphone_label"
         android:icon="@drawable/ic_archive_50" />
-
-    <!--<item-->
-        <!--android:id="@+id/phone_menu_item"-->
-        <!--android:title="@string/send_label"-->
-        <!--android:icon="@drawable/ic_bluetooth_50"/>-->
 
 	<item
         android:id="@+id/delete_menu_item"
-        android:title="@string/delete"
+        android:title="@string/delete_label"
         android:icon="@drawable/ic_delete_50" />
 
 
-	
+
 </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -3,12 +3,10 @@
 
     <string name="app_name">GlassShare</string>
 
-    <string name="delete">Delete</string>
-    <string name="share">Share</string>
-    <string name="upload">Save to Drive</string>
+    <string name="delete_label">Delete</string>
     <string name="deleted_label">Deleted</string>
     <string name="deleting_label">Deleting</string>
-    <string name="send_label">Push to Phone</string>
+    <string name="uploadphone_label">Push to MyGlassShare</string>
 
     <integer name="google_play_services_version">4030500</integer>
 

diff --git a/src/com/w9jds/glassshare/Classes/ImageItem.java b/src/com/w9jds/glassshare/Classes/ImageItem.java
@@ -0,0 +1,14 @@
+package com.w9jds.glassshare.Classes;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * Created by w9jds on 12/12/13.
+ */
+public class ImageItem
+{
+    @SerializedName("id")
+    public String mId;
+    public String mUserId;
+    public String mImage;
+}
diff --git a/src/com/w9jds/glassshare/Classses/ConnectedThread.java b/src/com/w9jds/glassshare/Classses/ConnectedThread.java