Merge branch 'master' into SlideUpPanel2

5 files changed, 34 insertions, 21 deletions

diff --git a/README b/README
deleted file mode 100644
index dc7be571..00000000
--- a/README
+++ /dev/null
@@ -1,20 +0,0 @@
-Basic Instructions
-Run these commands to grab dependent libraries:
-git submodule init
-git submodule update
-
-Go to DragSortListView/library, and ServerProxy and build project files with:
-android update project --path ./
-
-Add both projects and all .jar's in the libs folder
-
-SDK Project Dependencies (under sdk -> extras):
-android -> support -> v7 -> appcompat
-android -> support -> v7 -> mediarouter
-google -> google_play_services -> libproject -> google-play-services_lib
-
-SDK Library Dependencies:
-android -> support -> v4 -> android-support-v4.jar
-android -> support -> v7 -> appcompat -> libs android-support-v7-appcompat.jar
-android -> support -> v7 -> mediarouter -> libs -> android-support-v7-mediarouter.jar
-google -> google_play_services -> libproject -> google-play-services_lib -> lib -> google-play-services.jar
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..343ff873
--- /dev/null
+++ b/README.md
@@ -0,0 +1,25 @@
+##Basic Instructions
+Grab dependent libraries
+```
+git submodule init
+git submodule update
+```
+
+Go to DragSortListView/library and ServerProxy and build project files
+```
+android update project --path ./
+```
+
+Add both projects and all .jar's in the libs folder
+
+##SDK Project Dependencies
+Under sdk -> extras:<br>
+android -> support -> v7 -> appcompat<br>
+android -> support -> v7 -> mediarouter<br>
+google -> google_play_services -> libproject -> google-play-services_lib
+
+##SDK Library Dependencies
+android -> support -> v4 -> android-support-v4.jar<br>
+android -> support -> v7 -> appcompat -> libs android-support-v7-appcompat.jar<br>
+android -> support -> v7 -> mediarouter -> libs -> android-support-v7-mediarouter.jar<br>
+google -> google_play_services -> libproject -> google-play-services_lib -> lib -> google-play-services.jar
diff --git a/app/build.gradle b/app/build.gradle
index cdc1152b..c09f0f91 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -23,6 +23,12 @@ android {
 	lintOptions {
 		checkReleaseBuilds false
 	}
+
+	signingConfigs {
+		debug {
+			storeFile file('../debug.keystore')
+		}
+	}
 }
 
 dependencies {
diff --git a/app/src/main/java/github/daneren2005/dsub/service/CachedMusicService.java b/app/src/main/java/github/daneren2005/dsub/service/CachedMusicService.java
index f161cac6..3bc7f2a3 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/CachedMusicService.java
+++ b/app/src/main/java/github/daneren2005/dsub/service/CachedMusicService.java
@@ -489,6 +489,7 @@ public class CachedMusicService implements MusicService {
 			FileUtil.serialize(context, dir, getCacheName(context, type, Integer.toString(offset)));
 			return dir;
 		} catch(IOException e) {
+			Log.w(TAG, "Failed to refresh album list: ", e);
 			MusicDirectory dir = FileUtil.deserialize(context, getCacheName(context, type, Integer.toString(offset)), MusicDirectory.class);
 
 			if(dir == null) {
diff --git a/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java b/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java
index 40521051..bf68c450 100644
--- a/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java
+++ b/app/src/main/java/github/daneren2005/dsub/service/DownloadService.java
@@ -2111,7 +2111,8 @@ public class DownloadService extends Service {
 			return false;
 		}
 
-		int cutoffPoint = (int) (duration * DELETE_CUTOFF);
+		// Make cutoff a maximum of 10 minutes
+		int cutoffPoint = Math.min((int) (duration * DELETE_CUTOFF), 10 * 60 * 1000);
 		boolean isPastCutoff = duration > 0 && position > cutoffPoint;
 		
 		// Check to make sure song isn't within 10 seconds of where it was created