From ca176b9304039fa627e2843615d669c76a54e787 Mon Sep 17 00:00:00 2001 From: Valou3433 Date: Wed, 26 Sep 2018 17:38:24 +0200 Subject: [PATCH 1/7] bugfix tag editor + deezer player unlag (stackoverflow answer, still doesnt work well) --- app/app.iml | 1 + app/src/main/java/v/blade/library/Source.java | 15 +++++++++++---- .../main/java/v/blade/ui/TagEditorActivity.java | 16 ++++++++++------ 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/app/app.iml b/app/app.iml index 541f529..03f663e 100755 --- a/app/app.iml +++ b/app/app.iml @@ -115,6 +115,7 @@ + diff --git a/app/src/main/java/v/blade/library/Source.java b/app/src/main/java/v/blade/library/Source.java index 645255d..1b62b87 100755 --- a/app/src/main/java/v/blade/library/Source.java +++ b/app/src/main/java/v/blade/library/Source.java @@ -8,6 +8,7 @@ import android.graphics.Rect; import android.media.MediaPlayer; import android.net.Uri; +import android.os.Handler; import android.os.Looper; import android.provider.MediaStore; import android.util.Log; @@ -1604,10 +1605,16 @@ public void setListener(PlayerListener listener) @Override public void onPlayerStateChange(PlayerState playerState, long l) { - if(playerState.equals(PlayerState.PLAYBACK_COMPLETED)) - { - listener.onSongCompletion(); - } + new Handler(Looper.getMainLooper()).post(new Runnable() { + @Override + public void run() + { + if(playerState.equals(PlayerState.PLAYBACK_COMPLETED)) + { + listener.onSongCompletion(); + } + } + }); } }); } diff --git a/app/src/main/java/v/blade/ui/TagEditorActivity.java b/app/src/main/java/v/blade/ui/TagEditorActivity.java index dc167cf..ee61ad4 100644 --- a/app/src/main/java/v/blade/ui/TagEditorActivity.java +++ b/app/src/main/java/v/blade/ui/TagEditorActivity.java @@ -128,20 +128,24 @@ else if(currentObject instanceof Artist) TagOptionSingleton.getInstance().setAndroid(true); + for(Song currentSong : songs) { File basicFile = new File(currentSong.getPath()); String[] splitted = basicFile.getAbsolutePath().split("/"); - String[] splittedTreeUri = LibraryService.TREE_URI.getPath().split("/"); - int index = -1; - for(int i = 0; i < splitted.length; i++) + if(LibraryService.TREE_URI != null) { - if(splittedTreeUri[2].substring(0, splittedTreeUri[2].length()-1).equals(splitted[i])) + String[] splittedTreeUri = LibraryService.TREE_URI.getPath().split("/"); + + for(int i = 0; i < splitted.length; i++) { - index = i; - break; + if(splittedTreeUri[2].substring(0, splittedTreeUri[2].length()-1).equals(splitted[i])) + { + index = i; + break; + } } } From 3ee6959b94549c01cce106a15c274a08b20361f6 Mon Sep 17 00:00:00 2001 From: Valou3433 Date: Sun, 11 Nov 2018 16:58:57 +0100 Subject: [PATCH 2/7] quick bugfixes --- app/src/main/java/v/blade/player/PlayerMediaPlayer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/v/blade/player/PlayerMediaPlayer.java b/app/src/main/java/v/blade/player/PlayerMediaPlayer.java index 8151cbe..e81cb66 100755 --- a/app/src/main/java/v/blade/player/PlayerMediaPlayer.java +++ b/app/src/main/java/v/blade/player/PlayerMediaPlayer.java @@ -243,7 +243,7 @@ public void playSong(final Song song) if(song == null) return; currentSong = song; - if(currentActivePlayer != null && isPlaying()) currentActivePlayer.pause(null); + if(currentActivePlayer != null) currentActivePlayer.pause(null); //even if player if not playing, we pause (in case player was about to play) /* select appropriate mediaplayer and start playback */ if(song.getSources().getSourceByPriority(0) == null) @@ -275,7 +275,7 @@ public void onFailure(SourcePlayer player) { if(currentActivePlayer == player) { - Toast.makeText(context, context.getString(R.string.playback_error), Toast.LENGTH_SHORT).show(); + if(context != null) Toast.makeText(context, context.getString(R.string.playback_error), Toast.LENGTH_SHORT).show(); currentState = PLAYER_STATE_PAUSED; listener.onStateChange(); } From a50fb4163cf9e94154c6f3edea6ed86f5b647bd5 Mon Sep 17 00:00:00 2001 From: Valou3433 Date: Tue, 18 Dec 2018 17:39:00 +0100 Subject: [PATCH 3/7] quick bugfixes + explore group --- .idea/caches/build_file_checksums.ser | Bin 685 -> 685 bytes .idea/gradle.xml | 1 + .idea/misc.xml | 2 +- app/build.gradle | 22 ++++++------ .../java/v/blade/library/LibraryService.java | 25 +++++++------ .../java/v/blade/ui/TagEditorActivity.java | 2 +- .../main/res/menu/activity_main_drawer.xml | 34 +++++++++--------- app/src/main/res/values-en/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 10 files changed, 47 insertions(+), 42 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 59587ffa654b0048ead4de165c095fe66de8c3b7..5ab43d498b5ff18252af97873c5e653f754634c1 100644 GIT binary patch delta 33 rcmV++0N($t1+4{;mj!2V0QK>qoB|OU=znO!L1hHJQ;W~-&R3Oq^WhJB delta 33 rcmV++0N($t1+4{;mjz{aets39oB|P3>DBfex)Q;Vs%Me*vuQtg@>maf diff --git a/.idea/gradle.xml b/.idea/gradle.xml index e27dbea..92a3830 100755 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -5,6 +5,7 @@