Took out analytics, working on azure blob upload, and trying to fix c…

…rash on open.
w9jds · Dec 13, 2013 · c8e217e · c8e217e
1 parent 2907cd3
commit c8e217e
Show file tree

Hide file tree

Showing 30 changed files with 52,470 additions and 133,123 deletions.
diff --git a/.idea/libraries/microsoft_windowsazure_api_0_4_6.xml b/.idea/libraries/microsoft_windowsazure_api_0_4_6.xml
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.w9jds.glassshare"
-    android:versionCode="5"
-    android:versionName="0.5-alpha" >
+    android:versionCode="6"
+    android:versionName="0.6-alpha" >
 
     <uses-sdk
         android:minSdkVersion="15"
@@ -14,6 +14,7 @@
     <uses-permission android:name="android.permission.GET_ACCOUNTS"/>
     <uses-permission android:name="android.permission.USE_CREDENTIALS"/>
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
 
     <application
         android:allowBackup="true"

diff --git a/GlassShare.iml b/GlassShare.iml
@@ -30,6 +30,7 @@
     <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" />
+    <orderEntry type="library" exported="" name="microsoft-windowsazure-api-0.4.6" 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$2.class b/out/production/GlassShare/com/w9jds/glassshare/MainActivity$2.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/proguard-project.txt b/proguard-project.txt
@@ -13,6 +13,11 @@
 # Add any project specific keep options here:
 
 -dontwarn com.google.android.gms.auth.GoogleAuthUtil
+-dontwarn com.google.api.client.googleapis.extensions.android.gms.auth.UserRecoverableAuthIOException
+-dontwarn com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAccountCredential
+-dontwarn com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAccountCredential$RequestHandler
+-dontwarn com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAuthIOException
+-dontwarn com.google.api.client.googleapis.extensions.android.gms.auth.GooglePlayServicesAvailabilityIOException
 -dontwarn com.squareup.picasso.OkHttpLoader
 -dontwarn com.google.android.gms.common.GooglePlayServicesUtil
 -dontwarn com.google.android.gms.common.images.a

diff --git a/proguard_logs/dump.txt b/proguard_logs/dump.txt
diff --git a/proguard_logs/mapping.txt b/proguard_logs/mapping.txt
diff --git a/proguard_logs/seeds.txt b/proguard_logs/seeds.txt
diff --git a/proguard_logs/usage.txt b/proguard_logs/usage.txt
diff --git a/res/menu/main.xml b/res/menu/main.xml
@@ -5,21 +5,18 @@
 	    <!--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_label"
+        android:icon="@drawable/ic_archive_50" />
 
     <item
         android:id="@+id/uploadphone_menu_item"
-        android:title="@string/uploadphone_label"
-        android:icon="@drawable/ic_archive_50" />
+        android:title="@string/uploadphone_label" />
 
 	<item
         android:id="@+id/delete_menu_item"
         android:title="@string/delete_label"
         android:icon="@drawable/ic_delete_50" />
 
-
-
 </menu>
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -6,7 +6,9 @@
     <string name="delete_label">Delete</string>
     <string name="deleted_label">Deleted</string>
     <string name="deleting_label">Deleting</string>
-    <string name="uploadphone_label">Push to MyGlassShare</string>
+    <string name="upload_label">Push to Drive</string>
+    <string name="uploadphone_label">Save Blob</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