updates for share rest

t0st · Aug 9, 2015 · 0fbe14a · 0fbe14a
1 parent d5a9fed
commit 0fbe14a
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/app/app.iml b/app/app.iml
@@ -110,8 +110,8 @@
     <orderEntry type="library" exported="" name="zxing-android-legacy-2.0.0" level="project" />
     <orderEntry type="library" exported="" name="retrofit-1.9.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.1.1" level="project" />
-    <orderEntry type="library" exported="" name="slf4j-api-1.7.7" level="project" />
     <orderEntry type="library" exported="" name="gson-2.3.1" level="project" />
+    <orderEntry type="library" exported="" name="slf4j-api-1.7.7" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.1.1" level="project" />
     <orderEntry type="library" exported="" name="snackbar-2.10.8" level="project" />
     <orderEntry type="library" exported="" name="beta-1.1.3" level="project" />

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -206,7 +206,11 @@
             android:enabled="true"
             android:exported="true" >
         </service>
-
+        <service
+            android:name=".ShareModels.ShareRest"
+            android:enabled="true"
+            android:exported="true" >
+        </service>
         <service
             android:name=".UtilityModels.Notifications"
             android:exported="false" >

diff --git a/app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/ShareRest.java b/app/src/main/java/com/eveningoutpost/dexdrip/ShareModels/ShareRest.java
@@ -66,9 +66,6 @@ public void onCreate() {
         client = getOkClient();
         mContext = getApplicationContext();
         prefs = PreferenceManager.getDefaultSharedPreferences(mContext);
-        login = prefs.getString("dexcom_account_name", "");
-        password = prefs.getString("dexcom_account_password", "");
-        receiverSn = prefs.getString("share_key", "SM00000000").toUpperCase();
      }
 
     @Override
@@ -93,9 +90,14 @@ public int onStartCommand (Intent intent,int flags, int startId) {
                         Log.d(TAG, "New BG reading found but session does not exist");
                         getValidSessionId();
                     }
+                } else {
+                    Log.e(TAG, "Intent UUID was not null, but an empty string, cannot upload");
                 }
+            } else {
+                Log.e(TAG, "Intent UUID was null, cannot upload");
             }
         } else {
+            Log.w(TAG, "Share Credentials not entered!");
             stopSelf();
         }
         return START_NOT_STICKY;
@@ -259,7 +261,7 @@ public void continueUpload() {
         if(bg != null) {
             sendBgData(sessionId, bg);
         } else {
-            Log.d(TAG, "No BG, cannot continue");
+            Log.e(TAG, "BG was not found in database, cannot continue");
         }
     }
 
@@ -286,7 +288,6 @@ private RestAdapter.Builder authoirizeAdapterBuilder() {
         RestAdapter.Builder adapterBuilder = new RestAdapter.Builder();
         adapterBuilder
                 .setClient(client)
-                .setLogLevel(RestAdapter.LogLevel.FULL).setLog(new AndroidLog(TAG))
                 .setEndpoint("https://share1.dexcom.com/ShareWebServices/Services")
                 .setRequestInterceptor(authorizationRequestInterceptor)
                 .setConverter(new GsonConverter(new GsonBuilder()
@@ -299,7 +300,6 @@ private RestAdapter.Builder getBgAdapterBuilder() {
         RestAdapter.Builder adapterBuilder = new RestAdapter.Builder();
         adapterBuilder
                 .setClient(client)
-                .setLogLevel(RestAdapter.LogLevel.FULL).setLog(new AndroidLog(TAG))
                 .setEndpoint("https://share1.dexcom.com/ShareWebServices/Services")
                 .setRequestInterceptor(getBgRequestInterceptor)
                 .setConverter(new GsonConverter(new GsonBuilder()