Fixed removing from list and performing requests

IRA-Team · Oct 27, 2015 · 58c6055 · 58c6055
1 parent df1c1a4
commit 58c6055
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/app/src/main/java/com/irateam/vkplayer/activities/ListActivity.java b/app/src/main/java/com/irateam/vkplayer/activities/ListActivity.java
@@ -224,7 +224,6 @@ public void onComplete(List<Audio> list) {
 
     @Override
     public void onError(String errorMessage) {
-        audioAdapter.setList(Collections.emptyList());
         refreshLayout.setRefreshing(false);
         Snackbar.make(coordinatorLayout, errorMessage, Snackbar.LENGTH_LONG)
                 .setAction(getString(R.string.title_snackbar_action), v -> audioService.repeatLastRequest())

diff --git a/app/src/main/java/com/irateam/vkplayer/adapters/AudioAdapter.java b/app/src/main/java/com/irateam/vkplayer/adapters/AudioAdapter.java
@@ -81,8 +81,8 @@ public void updateAudiosById(List<Audio> audios) {
     }
 
     public void removeChecked() {
-        for (int i : checkedList) {
-            list.remove(i);
+        for (Audio audio : getCheckedItems()) {
+            list.remove(audio);
         }
         notifyDataSetChanged();
     }

diff --git a/app/src/main/java/com/irateam/vkplayer/player/Player.java b/app/src/main/java/com/irateam/vkplayer/player/Player.java
@@ -103,6 +103,10 @@ public int getPauseTime() {
 
     public void next() {
         int nextIndex;
+        if (list == null || list.size() == 0) {
+            stop();
+            return;
+        }
         if (randomState) {
             int size = list.size();
             do
@@ -122,6 +126,10 @@ public void next() {
 
     public void previous() {
         int previousIndex;
+        if (list == null || list.size() == 0) {
+            stop();
+            return;
+        }
         if (randomState && !randomStack.empty()) {
             previousIndex = list.indexOf(randomStack.pop());
         } else {

diff --git a/app/src/main/java/com/irateam/vkplayer/services/AudioService.java b/app/src/main/java/com/irateam/vkplayer/services/AudioService.java
@@ -143,7 +143,9 @@ public void removeAllCachedAudio() {
     @Override
     public void onError(VKError error) {
         super.onError(error);
-        notifyAllError(context.getString(R.string.error_load));
+        if (error.errorCode != VKError.VK_CANCELED) {
+            notifyAllError(context.getString(R.string.error_load));
+        }
     }
 
     public void addListener(Listener listener) {