Bunch of tweaks

Author: kaaes

sample-search/build.gradle

@@ -19,7 +19,6 @@ android {
     buildTypes {
         release {
             minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 }
@@ -39,6 +38,4 @@ dependencies {
     compile 'com.google.guava:guava:18.0'
     compile project(':spotify-api')
     compile(name: 'spotify-auth-1.0.0-beta12', ext: 'aar')
-
-    testCompile 'junit:junit:4.12'
 }

sample-search/proguard-rules.pro

@@ -3,31 +3,37 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 
+import java.util.concurrent.TimeUnit;
+
 public class CredentialsHandler {
 
-    public static void setToken(Context context, String token, long expiresIn) {
+    private static final String ACCESS_TOKEN_NAME = "webapi.credentials.access_token";
+    private static final String ACCESS_TOKEN = "access_token";
+    private static final String EXPIRES_AT = "expires_at";
+
+    public static void setToken(Context context, String token, long expiresIn, TimeUnit unit) {
         Context appContext = context.getApplicationContext();
 
         long now = System.currentTimeMillis();
-        long expiresAt = now + expiresIn * 1000;
+        long expiresAt = now + unit.toMillis(expiresIn);
 
         SharedPreferences sharedPref = getSharedPreferences(appContext);
         SharedPreferences.Editor editor = sharedPref.edit();
-        editor.putString(appContext.getString(R.string.access_token), token);
-        editor.putLong(appContext.getString(R.string.expires_at), expiresAt);
+        editor.putString(ACCESS_TOKEN, token);
+        editor.putLong(EXPIRES_AT, expiresAt);
         editor.apply();
     }
 
     private static SharedPreferences getSharedPreferences(Context appContext) {
-        return appContext.getSharedPreferences(appContext.getString(R.string.access_token_prefs), Context.MODE_PRIVATE);
+        return appContext.getSharedPreferences(ACCESS_TOKEN_NAME, Context.MODE_PRIVATE);
     }
 
     public static String getToken(Context context) {
         Context appContext = context.getApplicationContext();
         SharedPreferences sharedPref = getSharedPreferences(appContext);
 
-        String token = sharedPref.getString(appContext.getString(R.string.access_token), null);
-        long expiresAt = sharedPref.getLong(appContext.getString(R.string.expires_at), 0l);
+        String token = sharedPref.getString(ACCESS_TOKEN, null);
+        long expiresAt = sharedPref.getLong(EXPIRES_AT, 0L);
 
         if (token == null || expiresAt < System.currentTimeMillis()) {
             return null;

sample-search/src/androidTest/java/com/spotify/sdk/android/ApplicationTest.java

@@ -11,6 +11,8 @@
 import com.spotify.sdk.android.authentication.AuthenticationRequest;
 import com.spotify.sdk.android.authentication.AuthenticationResponse;
 
+import java.util.concurrent.TimeUnit;
+
 public class LoginActivity extends Activity {
 
     private static final String TAG = LoginActivity.class.getSimpleName();
@@ -53,7 +55,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent intent)
                 // Response was successful and contains auth token
                 case TOKEN:
                     logMessage("Got token: " + response.getAccessToken());
-                    CredentialsHandler.setToken(this, response.getAccessToken(), response.getExpiresIn());
+                    CredentialsHandler.setToken(this, response.getAccessToken(), response.getExpiresIn(), TimeUnit.SECONDS);
                     startMainActivity(response.getAccessToken());
                     break;
 

sample-search/src/main/java/kaaes/spotify/webapi/samplesearch/CredentialsHandler.java

@@ -48,7 +48,6 @@ private void getData(String query, int offset, final int limit, final CompleteLi
         mSpotifyApi.searchTracks(query, options, new SpotifyCallback<TracksPager>() {
             @Override
             public void success(TracksPager tracksPager, Response response) {
-//                mHasMoreItems = tracksPager.tracks.total > tracksPager.tracks.offset + tracksPager.tracks.limit;
                 listener.onComplete(tracksPager.tracks.items);
             }
 

sample-search/src/main/java/kaaes/spotify/webapi/samplesearch/LoginActivity.java

@@ -88,11 +88,6 @@ public void onBindViewHolder(ViewHolder holder, int position) {
         }
     }
 
-    @Override
-    public long getItemId(int position) {
-        return 0;
-    }
-
     @Override
     public int getItemCount() {
         return mItems.size();

sample-search/src/main/java/kaaes/spotify/webapi/samplesearch/SearchPager.java

@@ -1,9 +1,6 @@
 <resources>
-    <string name="app_name">Web API Search Example</string>
+    <string name="app_name">Search Example</string>
     <string name="login_button">Login to Spotify</string>
-    <string name="access_token_prefs">com.spotify.sdk.android.access_token</string>
-    <string name="access_token">access_token</string>
-    <string name="expires_at">expires_at</string>
     <string name="search">Search</string>
     <string name="cover_art_description">Cover art</string>
     <string name="search_hint">Search tracks</string>