From d5353f63affe9d68dad516cf89eaa6e9ad0ee9a8 Mon Sep 17 00:00:00 2001
From: Sergey Yeriomin <yeriomin@gmail.com>
Date: Tue, 13 Dec 2016 22:40:08 +0300
Subject: [PATCH] Fixed token not being used right after log in.

---
 app/build.gradle                                       |  4 ++--
 .../yeriomin/playstoreapi/ThrottledHttpClient.java     |  6 ------
 .../github/yeriomin/yalpstore/PlayStoreApiWrapper.java | 10 ++++------
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 7fa510661..48c59548a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,14 +3,14 @@ apply plugin: 'com.google.protobuf'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.1"
+    buildToolsVersion "25.0.2"
 
     defaultConfig {
         applicationId "com.github.yeriomin.yalpstore"
         minSdkVersion 10
         targetSdkVersion 25
         versionCode 1
-        versionName "1.0"
+        versionName "0.1"
     }
     buildTypes {
         release {
diff --git a/app/src/main/java/com/github/yeriomin/playstoreapi/ThrottledHttpClient.java b/app/src/main/java/com/github/yeriomin/playstoreapi/ThrottledHttpClient.java
index 154362d60..54ab894d0 100644
--- a/app/src/main/java/com/github/yeriomin/playstoreapi/ThrottledHttpClient.java
+++ b/app/src/main/java/com/github/yeriomin/playstoreapi/ThrottledHttpClient.java
@@ -89,14 +89,8 @@ class ThrottledHttpClient extends DefaultHttpClient {
         HttpResponse response = this.execute(request);
         this.lastRequestTime = System.currentTimeMillis();
         int statusCode = response.getStatusLine().getStatusCode();
-        boolean isProtobuf = response.containsHeader("Content-Type")
-            && response.getHeaders("Content-Type")[0].getValue().contains("protobuf");
         byte[] content = readAll(response.getEntity().getContent());
 
-        if (!isProtobuf) {
-            throw new GooglePlayException(String.valueOf(statusCode) + " Thats not even protobuf: " + new String(content), statusCode);
-        }
-
         if (statusCode >= 400) {
             throw new GooglePlayException(String.valueOf(statusCode) + " Probably an auth error: " + new String(content), statusCode);
         }
diff --git a/app/src/main/java/com/github/yeriomin/yalpstore/PlayStoreApiWrapper.java b/app/src/main/java/com/github/yeriomin/yalpstore/PlayStoreApiWrapper.java
index 242fecda4..96d0f2978 100644
--- a/app/src/main/java/com/github/yeriomin/yalpstore/PlayStoreApiWrapper.java
+++ b/app/src/main/java/com/github/yeriomin/yalpstore/PlayStoreApiWrapper.java
@@ -112,20 +112,18 @@ public class PlayStoreApiWrapper {
                     gsfId = api.getGsfId();
                     prefsEditor.putString(AppListActivity.PREFERENCE_GSF_ID, gsfId);
                     prefsEditor.commit();
-                } else {
-                    api.setGsfId(gsfId);
+                    System.out.println("new gsfId " + gsfId);
                 }
-                System.out.println("new gsfId " + gsfId);
+                api.setGsfId(gsfId);
                 if (token.isEmpty()) {
                     token = api.getToken();
                     prefsEditor.putString(AppListActivity.PREFERENCE_EMAIL, email);
                     prefsEditor.putString(AppListActivity.PREFERENCE_PASSWORD, password);
                     prefsEditor.putString(AppListActivity.PREFERENCE_AUTH_TOKEN, token);
                     prefsEditor.commit();
-                } else {
-                    api.setToken(token);
+                    System.out.println("new token " + token);
                 }
-                System.out.println("new token " + token);
+                api.setToken(token);
             } catch (GooglePlayException e) {
                 int code = e.getCode();
                 // auth/checkin requests answer with 401/403 when credentials are incorrect