From fe19f00e5ee5afcb0a87a3dc88d0459d89ed352d Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Fri, 3 Jan 2025 15:44:17 +0000 Subject: [PATCH 01/37] added Play.java service --- .../java/tw/music/streamer/service/Play.java | 80 +++++++++++++++++++ 1 file changed, 80 insertions(+) create mode 100644 app/src/main/java/tw/music/streamer/service/Play.java diff --git a/app/src/main/java/tw/music/streamer/service/Play.java b/app/src/main/java/tw/music/streamer/service/Play.java new file mode 100644 index 0000000..6e4e449 --- /dev/null +++ b/app/src/main/java/tw/music/streamer/service/Play.java @@ -0,0 +1,80 @@ +package tw.music.streamer.service; + +import android.os.Build; +import android.os.Handler; +import android.os.IBinder; +import android.app.Service; +import android.content.Intent; +import android.content.Context; +import android.content.BroadcastReceiver; + +import androidx.annotation.Nullable; + +public class Play extends Service { + + private BroadcastReceiver br; + + @Override + public void onCreate() { + super.onCreate(); + initializePlayer(); + } + + @Override + public int onStartCommand(Intent a, int b, int c) { + return START_STICKY; + } + + @Override + public void onDestroy() { + super.onDestroy(); + } + + @Nullable + @Override + public IBinder onBind(Intent a) { + return null; + } + + private void initializePlayer() { + br = new BroadcastReceiver() { + @Override + public void onReceive(Context a, Intent b) { + act = b.getStringExtra("action"); + if (act.equals("seek")) { + seekSong(b); + } + } + } + IntentFilter ief = new IntentFilter("tw.music.streamer.ACTION"); + registerReceiver(br, ief); + } + + private void _play(final String _key) { //line 2703 + _CoreProgressLoading(true); + tmservice._resetMp(); + final double _position = currentlyChild.indexOf(_key); + tmservice._playSongFromURL(currentlyMap.get((int) _position).get("url").toString()); + currentlyPlaying = _key; + text_title.setText(currentlyMap.get((int) _position).get("name").toString()); + if (usrname_list.contains(currentlyMap.get((int) _position).get("uid").toString())) { + text_artist.setText(profile_map.get(usrname_list.indexOf(currentlyMap.get((int) _position).get("uid").toString())).get("username").toString()); + } else { + text_artist.setText(currentlyMap.get((int) _position).get("uid").toString()); + } + if (adminsList.contains(currentlyMap.get((int) _position).get("uid").toString())) { + text_artist.setTextColor(Color.parseColor(theme_map.get(0).get("colorButton").toString())); + } else { + text_artist.setTextColor(Color.parseColor(theme_map.get(0).get("colorPrimaryCardText").toString())); + } + if (currentlyMap.get((int) _position).containsKey("img")) { + image_album.clearColorFilter(); + Glide.with(getApplicationContext()).load(currentlyMap.get((int) _position).get("img").toString()).centerCrop().into(image_album); + } else { + image_album.setImageResource(R.drawable.ic_album_white); + image_album.setColorFilter(Color.parseColor(theme_map.get(0).get("colorButtonText").toString()), PorterDuff.Mode.MULTIPLY); + } + } + + +} \ No newline at end of file From 52664a2139f7849f48af6d29df100907ffd70899 Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Fri, 3 Jan 2025 16:07:27 +0000 Subject: [PATCH 02/37] rebuilt the MediaPlayer implements --- .../java/tw/music/streamer/service/Play.java | 69 ++++++++++++------- 1 file changed, 43 insertions(+), 26 deletions(-) diff --git a/app/src/main/java/tw/music/streamer/service/Play.java b/app/src/main/java/tw/music/streamer/service/Play.java index 6e4e449..131f3ad 100644 --- a/app/src/main/java/tw/music/streamer/service/Play.java +++ b/app/src/main/java/tw/music/streamer/service/Play.java @@ -4,15 +4,22 @@ import android.os.Handler; import android.os.IBinder; import android.app.Service; +import android.media.MediaPlayer; +import android.media.AudioManager; import android.content.Intent; import android.content.Context; +import android.content.IntentFilter; import android.content.BroadcastReceiver; import androidx.annotation.Nullable; -public class Play extends Service { +public class Play extends Service implements MediaPlayer.OnPreparedListener, MediaPlayer.OnBufferingUpdateListener, { private BroadcastReceiver br; + private MediaPlayer mp; + private IntentFilter ief; + + private MediaPlayer.OnPreparedListener onprep; @Override public void onCreate() { @@ -37,6 +44,7 @@ public IBinder onBind(Intent a) { } private void initializePlayer() { + mp = new MediaPlayer(); br = new BroadcastReceiver() { @Override public void onReceive(Context a, Intent b) { @@ -46,35 +54,44 @@ public void onReceive(Context a, Intent b) { } } } - IntentFilter ief = new IntentFilter("tw.music.streamer.ACTION"); + ief = new IntentFilter("tw.music.streamer.ACTION"); registerReceiver(br, ief); + applyMediaListener(); } - private void _play(final String _key) { //line 2703 - _CoreProgressLoading(true); - tmservice._resetMp(); - final double _position = currentlyChild.indexOf(_key); - tmservice._playSongFromURL(currentlyMap.get((int) _position).get("url").toString()); - currentlyPlaying = _key; - text_title.setText(currentlyMap.get((int) _position).get("name").toString()); - if (usrname_list.contains(currentlyMap.get((int) _position).get("uid").toString())) { - text_artist.setText(profile_map.get(usrname_list.indexOf(currentlyMap.get((int) _position).get("uid").toString())).get("username").toString()); - } else { - text_artist.setText(currentlyMap.get((int) _position).get("uid").toString()); - } - if (adminsList.contains(currentlyMap.get((int) _position).get("uid").toString())) { - text_artist.setTextColor(Color.parseColor(theme_map.get(0).get("colorButton").toString())); - } else { - text_artist.setTextColor(Color.parseColor(theme_map.get(0).get("colorPrimaryCardText").toString())); - } - if (currentlyMap.get((int) _position).containsKey("img")) { - image_album.clearColorFilter(); - Glide.with(getApplicationContext()).load(currentlyMap.get((int) _position).get("img").toString()).centerCrop().into(image_album); - } else { - image_album.setImageResource(R.drawable.ic_album_white); - image_album.setColorFilter(Color.parseColor(theme_map.get(0).get("colorButtonText").toString()), PorterDuff.Mode.MULTIPLY); - } + @Override + public void onPrepared(MediaPlayer a) { + //sendDataToActivity(1, ""); + } + + @Override + public void onBufferingUpdate(MediaPlayer a, int b) { + //sendDataToActivity(2, String.valueOf((long) _percent)); } + private void applyMediaListener() { + mp.setOnPreparedListener(this); + mp.setOnBufferingUpdateListener(this); + mp.setOnCompletionListener(new MediaPlayer.OnCompletionListener() { + public void onCompletion(MediaPlayer _unmp) { + sendDataToActivity(3, ""); + } + }); + mp.setOnErrorListener(new MediaPlayer.OnErrorListener() { + @Override + public boolean onError(MediaPlayer _unmp, int _param1, int _param2) { + sendDataToActivity(4, String.format("Error(%s%s)", _param1, _param2)); + return true; + } + }); + } + + private void playSong(String a) { + mp = new MediaPlayer(); + mp.setAudioStreamType(AudioManager.STREAM_MUSIC); + mp.setDataSource(a); + + mp.prepareAsync(); + } } \ No newline at end of file From 600f9846372f5cfaf392a16a8f0bc638dd2ea5a6 Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Fri, 3 Jan 2025 16:11:52 +0000 Subject: [PATCH 03/37] commit :P --- .../java/tw/music/streamer/service/Play.java | 37 ++++++++++++------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/app/src/main/java/tw/music/streamer/service/Play.java b/app/src/main/java/tw/music/streamer/service/Play.java index 131f3ad..035b73b 100644 --- a/app/src/main/java/tw/music/streamer/service/Play.java +++ b/app/src/main/java/tw/music/streamer/service/Play.java @@ -13,7 +13,7 @@ import androidx.annotation.Nullable; -public class Play extends Service implements MediaPlayer.OnPreparedListener, MediaPlayer.OnBufferingUpdateListener, { +public class Play extends Service implements MediaPlayer.OnPreparedListener, MediaPlayer.OnBufferingUpdateListener, MediaPlayer.OnCompletionListener, MediaPlayer.OnErrorListener { private BroadcastReceiver br; private MediaPlayer mp; @@ -51,6 +51,14 @@ public void onReceive(Context a, Intent b) { act = b.getStringExtra("action"); if (act.equals("seek")) { seekSong(b); + } else if (act.equals("pause")) { + pauseSong(); + } else if (act.equals("resume")) { + resumeSong(); + } else if (act.equals("prev-song")) { + playPreviousSong(); + } else if (act.equals("next-song")) { + playNextSong(); } } } @@ -69,28 +77,29 @@ public void onBufferingUpdate(MediaPlayer a, int b) { //sendDataToActivity(2, String.valueOf((long) _percent)); } + @Override + public void onCompletion(MediaPlayer a) { + //sendDataToActivity(3, ""); + } + + @Override + public boolean onError(MediaPlayer a, int b, int c) { + //sendDataToActivity(4, String.format("Error(%s%s)", b, c)); + return true; + } + private void applyMediaListener() { mp.setOnPreparedListener(this); mp.setOnBufferingUpdateListener(this); - mp.setOnCompletionListener(new MediaPlayer.OnCompletionListener() { - public void onCompletion(MediaPlayer _unmp) { - sendDataToActivity(3, ""); - } - }); - mp.setOnErrorListener(new MediaPlayer.OnErrorListener() { - @Override - public boolean onError(MediaPlayer _unmp, int _param1, int _param2) { - sendDataToActivity(4, String.format("Error(%s%s)", _param1, _param2)); - return true; - } - }); + mp.setOnCompletionListener(this); + mp.setOnErrorListener(this); } private void playSong(String a) { mp = new MediaPlayer(); mp.setAudioStreamType(AudioManager.STREAM_MUSIC); mp.setDataSource(a); - + applyMediaListener(); mp.prepareAsync(); } From 1328f6af6fa1112f85a97ddcdad6fbc619ece282 Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Fri, 3 Jan 2025 16:24:04 +0000 Subject: [PATCH 04/37] e --- .../java/tw/music/streamer/service/Play.java | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/app/src/main/java/tw/music/streamer/service/Play.java b/app/src/main/java/tw/music/streamer/service/Play.java index 035b73b..e0170bd 100644 --- a/app/src/main/java/tw/music/streamer/service/Play.java +++ b/app/src/main/java/tw/music/streamer/service/Play.java @@ -101,6 +101,36 @@ private void playSong(String a) { mp.setDataSource(a); applyMediaListener(); mp.prepareAsync(); + tellActivity("play-song","1"); + } + + private void pauseSong() { + + } + + private void resumeSong() { + + } + + private void seekSong(Intent a) { + if (mp==null) return; + mp.seekTo(a.getIntExtra("seekpos",0)); + tellActivity("request-seek","1"); + } + + private void playPreviousSong() { + + } + + private void playNextSong() { + + } + + private void tellActivity(String a, String b) { + ita = new Intent("tw.music.streamer.ACTION_UPDATE"); + ita.putExtra("update", a); + ita.putExtra("data", b); + sendBroadcast(ita); } } \ No newline at end of file From 992885d3393e4f34ed8cdeefc163fcb683926574 Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Fri, 3 Jan 2025 16:33:52 +0000 Subject: [PATCH 05/37] q --- .../java/tw/music/streamer/service/Play.java | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/tw/music/streamer/service/Play.java b/app/src/main/java/tw/music/streamer/service/Play.java index e0170bd..6b9627d 100644 --- a/app/src/main/java/tw/music/streamer/service/Play.java +++ b/app/src/main/java/tw/music/streamer/service/Play.java @@ -34,6 +34,11 @@ public int onStartCommand(Intent a, int b, int c) { @Override public void onDestroy() { + unregisterReceiver(br); + if (mp!=null) { + mp.release(); + mp = null; + } super.onDestroy(); } @@ -101,15 +106,31 @@ private void playSong(String a) { mp.setDataSource(a); applyMediaListener(); mp.prepareAsync(); - tellActivity("play-song","1"); + tellActivity("request-play","1"); } private void pauseSong() { - + if (mp==null) return; + if (mp.isPlaying()) { + mp.pause(); + tellActivity("request-pause","1"); + } } private void resumeSong() { + if (mp==null) return; + if (mp.isPlaying()) { + mp.resume(); + tellActivity("request-resume","1"); + } + } + private void stopSong() { + if (mp==null) return; + if (mp.isPlaying()) { + mp.stop(); + tellActivity("request-stop","1"); + } } private void seekSong(Intent a) { From ecc1748d144f9100d367a7e4e7d9ce06046c693f Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Fri, 3 Jan 2025 17:22:04 +0000 Subject: [PATCH 06/37] renamed Play.java -> ZryteZenePlay.java new BroadcastReceiver on StreamerActivity.java start from line 4754 --- .../tw/music/streamer/StreamerActivity.java | 110 ++++++------------ .../service/{Play.java => ZryteZenePlay.java} | 28 +++-- 2 files changed, 54 insertions(+), 84 deletions(-) rename app/src/main/java/tw/music/streamer/service/{Play.java => ZryteZenePlay.java} (80%) diff --git a/app/src/main/java/tw/music/streamer/StreamerActivity.java b/app/src/main/java/tw/music/streamer/StreamerActivity.java index bf81da4..613f155 100644 --- a/app/src/main/java/tw/music/streamer/StreamerActivity.java +++ b/app/src/main/java/tw/music/streamer/StreamerActivity.java @@ -312,78 +312,6 @@ public class StreamerActivity extends AppCompatActivity { private androidx.viewpager.widget.ViewPager viewPager; private android.graphics.drawable.AnimationDrawable rocketAnimation; private ProgressDialog coreprog; - private ServiceConnection serviceConnection = new ServiceConnection() { - @Override - public void onServiceConnected(ComponentName componentName, IBinder iBinder) { - tmservice = (ZryteZeneServiceBinder) iBinder; - tmservice.setContext(getApplicationContext()); - - dataHandlerReceiverZero = new Handler() { - @Override - public void handleMessage(Message msg) { - _updateTime(); - } - }; - - tmservice.setDataHandler(dataHandlerReceiverZero, 0); - - dataHandlerReceiverOne = new Handler() { - @Override - public void handleMessage(Message msg) { - _mpPreparedListener(); - } - }; - - tmservice.setDataHandler(dataHandlerReceiverOne, 1); - - dataHandlerReceiverTwo = new Handler() { - @Override - public void handleMessage(Message msg) { - _mpBufferingUpdate(msg.what); - } - }; - - tmservice.setDataHandler(dataHandlerReceiverTwo, 2); - - dataHandlerReceiverThree = new Handler() { - @Override - public void handleMessage(Message msg) { - _mpCompletionListener(); - } - }; - - tmservice.setDataHandler(dataHandlerReceiverThree, 3); - - dataHandlerReceiverFour = new Handler() { - @Override - public void handleMessage(Message msg) { - _mpErrorListener(tmservice._tmpFour); - } - }; - - tmservice.setDataHandler(dataHandlerReceiverFour, 4); - - dataHandlerReceiverFive = new Handler() { - @Override - public void handleMessage(Message msg) { - _handleMpError(tmservice._tmpFive); - } - }; - - tmservice.setDataHandler(dataHandlerReceiverFive, 5); - - tmservice.initializeTM(); - fb_likes.addChildEventListener(_fb_likes_child_listener); - } - - @Override - public void onServiceDisconnected(ComponentName componentName) { - - } - }; - - { - } @Override protected void onCreate(Bundle _savedInstanceState) { @@ -4823,4 +4751,42 @@ public void onClick(DialogInterface _dialog, int _which) { } } + private void tellService(String a, String b) { + Intent jof = new Intent(getApplicationContext(), ZryteZenePlay.class); + jof.putExtra("action", a); + jof.putExtra("req-data", b); + } + + private BroadcastReceiver brr = new BroadcastReceiver() { + @Override + public void onReceive(Context a, Intent b) { + String c = b.getStringExtra("update"); + switch (c) { + case "on-prepared": + break; + case "on-bufferupdate": + break; + case "on-completion": + break; + case "on-error": + break; + case "request-play": + break; + case "request-pause": + break; + case "request-resume": + break; + case "request-stop": + break; + case "request-seek": + break; + case "request-prevsong": + break; + case "request-nextsong": + break; + } + } + }; + + } diff --git a/app/src/main/java/tw/music/streamer/service/Play.java b/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java similarity index 80% rename from app/src/main/java/tw/music/streamer/service/Play.java rename to app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java index 6b9627d..23f7e95 100644 --- a/app/src/main/java/tw/music/streamer/service/Play.java +++ b/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java @@ -1,25 +1,25 @@ package tw.music.streamer.service; -import android.os.Build; -import android.os.Handler; import android.os.IBinder; import android.app.Service; +import android.app.Activity; import android.media.MediaPlayer; import android.media.AudioManager; import android.content.Intent; import android.content.Context; import android.content.IntentFilter; import android.content.BroadcastReceiver; +import android.content.SharedPreferences; import androidx.annotation.Nullable; -public class Play extends Service implements MediaPlayer.OnPreparedListener, MediaPlayer.OnBufferingUpdateListener, MediaPlayer.OnCompletionListener, MediaPlayer.OnErrorListener { +public class ZryteZenePlay extends Service implements MediaPlayer.OnPreparedListener, MediaPlayer.OnBufferingUpdateListener, MediaPlayer.OnCompletionListener, MediaPlayer.OnErrorListener { private BroadcastReceiver br; private MediaPlayer mp; private IntentFilter ief; - - private MediaPlayer.OnPreparedListener onprep; + private SharedPreferences sp; + private String lm, act; @Override public void onCreate() { @@ -49,6 +49,8 @@ public IBinder onBind(Intent a) { } private void initializePlayer() { + sp = getSharedPreferences("teamdata", Activity.MODE_PRIVATE); + lm = sp.getString("fvsAsc", ""); mp = new MediaPlayer(); br = new BroadcastReceiver() { @Override @@ -74,22 +76,22 @@ public void onReceive(Context a, Intent b) { @Override public void onPrepared(MediaPlayer a) { - //sendDataToActivity(1, ""); + tellActivity("on-prepared","1"); } @Override public void onBufferingUpdate(MediaPlayer a, int b) { - //sendDataToActivity(2, String.valueOf((long) _percent)); + tellActivity("on-bufferupdate",b); } @Override public void onCompletion(MediaPlayer a) { - //sendDataToActivity(3, ""); + tellActivity("on-completion","1"); } @Override public boolean onError(MediaPlayer a, int b, int c) { - //sendDataToActivity(4, String.format("Error(%s%s)", b, c)); + tellActivity("on-error", String.format("Error(%s%s)", b, c)); return true; } @@ -135,8 +137,10 @@ private void stopSong() { private void seekSong(Intent a) { if (mp==null) return; - mp.seekTo(a.getIntExtra("seekpos",0)); - tellActivity("request-seek","1"); + if (mp.isPlaying()) { + mp.seekTo(a.getIntExtra("seekpos",0)); + tellActivity("request-seek","1"); + } } private void playPreviousSong() { @@ -148,7 +152,7 @@ private void playNextSong() { } private void tellActivity(String a, String b) { - ita = new Intent("tw.music.streamer.ACTION_UPDATE"); + ita = new Intent("tw.music.streamer.STATUS_UPDATE"); ita.putExtra("update", a); ita.putExtra("data", b); sendBroadcast(ita); From f7ae321804121b2d607f842b459d247caf3fb106 Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Fri, 3 Jan 2025 17:45:52 +0000 Subject: [PATCH 07/37] so many --- .../tw/music/streamer/StreamerActivity.java | 24 ++++++------------ .../streamer/adaptor/ZryteZeneAdaptor.java | 25 +++++++++++++++++++ .../music/streamer/service/ZryteZenePlay.java | 19 +++++++------- 3 files changed, 43 insertions(+), 25 deletions(-) create mode 100644 app/src/main/java/tw/music/streamer/adaptor/ZryteZeneAdaptor.java diff --git a/app/src/main/java/tw/music/streamer/StreamerActivity.java b/app/src/main/java/tw/music/streamer/StreamerActivity.java index 613f155..4b59d7d 100644 --- a/app/src/main/java/tw/music/streamer/StreamerActivity.java +++ b/app/src/main/java/tw/music/streamer/StreamerActivity.java @@ -121,6 +121,8 @@ import java.util.HashMap; import java.util.Random; +import tw.music.streamer.adaptor.ZryteZeneAdaptor; + public class StreamerActivity extends AppCompatActivity { private FirebaseDatabase _firebase = FirebaseDatabase.getInstance(); @@ -312,6 +314,7 @@ public class StreamerActivity extends AppCompatActivity { private androidx.viewpager.widget.ViewPager viewPager; private android.graphics.drawable.AnimationDrawable rocketAnimation; private ProgressDialog coreprog; + private ZryteZeneAdaptor zz; @Override protected void onCreate(Bundle _savedInstanceState) { @@ -445,6 +448,7 @@ public void onClick(View _v) { data = getSharedPreferences("teamdata", Activity.MODE_PRIVATE); Auth = FirebaseAuth.getInstance(); d = new AlertDialog.Builder(this); + zz = new ZryteZeneAdaptor(); image_drawer.setOnClickListener(new View.OnClickListener() { @Override @@ -691,6 +695,7 @@ public void onClick(View _view) { } } } + zz.requestAction("update-sp","loop"); } }); @@ -701,12 +706,12 @@ public void onClick(View _view) { if (data.getString("nightcore", "").equals("1")) { data.edit().putString("nightcore", "0").commit(); image_nightcore.setAlpha((float) (0.5d)); - tmservice._setNightcore(1.00f); + //tmservice._setNightcore(1.00f); } else { data.edit().putString("nightcore", "1").commit(); image_nightcore.setAlpha((float) (1.0d)); float _tmpFloat = 1.10f + ((float) Double.parseDouble(data.getString("nightcoreSpeed", "")) * 0.05f); - tmservice._setNightcore(_tmpFloat); + //tmservice._setNightcore(_tmpFloat); } } else { data.edit().putString("nightcore", "0").commit(); @@ -775,18 +780,11 @@ public void onProgressChanged(SeekBar _param1, int _param2, boolean _param3) { @Override public void onStartTrackingTouch(SeekBar _param1) { - if (!tmservice._isMpNull()) { - tmservice._mpPause(); - tmservice._removeFocus(); - } } @Override public void onStopTrackingTouch(SeekBar _param2) { - if (!tmservice._isMpNull()) { - tmservice._mpSeek(seekbar1.getProgress() * 1000); - tmservice._requestFocus(); - } + zz.requestAction("seek", seekbar1.getProgress() * 1000); } }); @@ -4751,12 +4749,6 @@ public void onClick(DialogInterface _dialog, int _which) { } } - private void tellService(String a, String b) { - Intent jof = new Intent(getApplicationContext(), ZryteZenePlay.class); - jof.putExtra("action", a); - jof.putExtra("req-data", b); - } - private BroadcastReceiver brr = new BroadcastReceiver() { @Override public void onReceive(Context a, Intent b) { diff --git a/app/src/main/java/tw/music/streamer/adaptor/ZryteZeneAdaptor.java b/app/src/main/java/tw/music/streamer/adaptor/ZryteZeneAdaptor.java new file mode 100644 index 0000000..9d0e654 --- /dev/null +++ b/app/src/main/java/tw/music/streamer/adaptor/ZryteZeneAdaptor.java @@ -0,0 +1,25 @@ +package tw.music.streamer.adaptor; + +import android.content.Intent; + +import tw.music.streamer.service.ZryteZenePlay; + +public class ZryteZeneAdaptor { //line 769 + + public void ZryteZeneAdaptor() { + } + + public void requestAction(String a, int b) { + Intent jof = new Intent(getApplicationContext(), ZryteZenePlay.class); + jof.putExtra("action", a); + jof.putExtra("req-data", b); + sendBroadcast(jof); + } + + public void requestAction(String a, String b) { + Intent jof = new Intent(getApplicationContext(), ZryteZenePlay.class); + jof.putExtra("action", a); + jof.putExtra("req-data", b); + sendBroadcast(jof); + } +} \ No newline at end of file diff --git a/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java b/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java index 23f7e95..0e9d5f0 100644 --- a/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java +++ b/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java @@ -66,6 +66,9 @@ public void onReceive(Context a, Intent b) { playPreviousSong(); } else if (act.equals("next-song")) { playNextSong(); + } else if (act.equals("update-sp")) { + String c = b.getStringData("req-data"); + updateSP(c); } } } @@ -138,19 +141,11 @@ private void stopSong() { private void seekSong(Intent a) { if (mp==null) return; if (mp.isPlaying()) { - mp.seekTo(a.getIntExtra("seekpos",0)); + mp.seekTo(a.getIntExtra("req-data",0)); tellActivity("request-seek","1"); } } - private void playPreviousSong() { - - } - - private void playNextSong() { - - } - private void tellActivity(String a, String b) { ita = new Intent("tw.music.streamer.STATUS_UPDATE"); ita.putExtra("update", a); @@ -158,4 +153,10 @@ private void tellActivity(String a, String b) { sendBroadcast(ita); } + private void updateSP(String a) { + if (a.equals("loop")) { + lm = sp.getString("fvsAsc", ""); + } + } + } \ No newline at end of file From 472b0a935b26b65ced52e1c9dc8f3c40dc988cdf Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Fri, 3 Jan 2025 18:56:13 +0000 Subject: [PATCH 08/37] please dont ask whats new --- .../tw/music/streamer/StreamerActivity.java | 52 ++++++++++--------- .../streamer/adaptor/ZryteZeneAdaptor.java | 42 ++++++++++++++- .../music/streamer/service/ZryteZenePlay.java | 52 ++++++++++++++----- 3 files changed, 108 insertions(+), 38 deletions(-) diff --git a/app/src/main/java/tw/music/streamer/StreamerActivity.java b/app/src/main/java/tw/music/streamer/StreamerActivity.java index 4b59d7d..f8a4f1b 100644 --- a/app/src/main/java/tw/music/streamer/StreamerActivity.java +++ b/app/src/main/java/tw/music/streamer/StreamerActivity.java @@ -806,12 +806,12 @@ public void onClick(View _view) { image_play.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View _view) { - if (tmservice._isPlaying()) { + /*if (tmservice._isPlaying()) { tmservice._mpPause(); tmservice._removeFocus(); } else { tmservice._requestFocus(); - } + }*/ } }); @@ -1621,7 +1621,6 @@ public void onClick(View _view) { public void onComplete(Task _param1) { final boolean _success = _param1.isSuccessful(); final String _errorMessage = _param1.getException() != null ? _param1.getException().getMessage() : ""; - } }; @@ -1630,7 +1629,6 @@ public void onComplete(Task _param1) { public void onComplete(Task _param1) { final boolean _success = _param1.isSuccessful(); final String _errorMessage = _param1.getException() != null ? _param1.getException().getMessage() : ""; - } }; @@ -1638,7 +1636,6 @@ public void onComplete(Task _param1) { @Override public void onComplete(Task _param1) { final boolean _success = _param1.isSuccessful(); - } }; } @@ -2244,13 +2241,13 @@ private void _loadTheme() { } private void _refreshLikes() { - if (!tmservice._isMpNull()) { + //if (!tmservice._isMpNull()) { if (likeChild.contains(currentlyPlaying.concat(FirebaseAuth.getInstance().getCurrentUser().getUid()))) { image_favs.setImageResource(R.drawable.ic_favorite); } else { image_favs.setImageResource(R.drawable.ic_favorite_border); } - } + //} } private void _CoreProgressLoading(final boolean _ifShow) { @@ -2628,9 +2625,9 @@ public void onClick(DialogInterface _dialog, int _which) { private void _play(final String _key) { _CoreProgressLoading(true); - tmservice._resetMp(); + //tmservice._resetMp(); final double _position = currentlyChild.indexOf(_key); - tmservice._playSongFromURL(currentlyMap.get((int) _position).get("url").toString()); + //tmservice._playSongFromURL(currentlyMap.get((int) _position).get("url").toString()); currentlyPlaying = _key; text_title.setText(currentlyMap.get((int) _position).get("name").toString()); if (usrname_list.contains(currentlyMap.get((int) _position).get("uid").toString())) { @@ -2650,6 +2647,7 @@ private void _play(final String _key) { image_album.setImageResource(R.drawable.ic_album_white); image_album.setColorFilter(Color.parseColor(theme_map.get(0).get("colorButtonText").toString()), PorterDuff.Mode.MULTIPLY); } + zz.requestAction("play",currentlyMap.get((int) _position).get("url").toString()); } private void _NewTapTarget(final View _view, final String _title, final String _msg, final String _bgcolor) { @@ -2715,14 +2713,14 @@ private void _mpPreparedListener() { if (data.getString("nightcore", "").equals("1")) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { float _tmpFloat = 1.10f + ((float) Double.parseDouble(data.getString("nightcoreSpeed", "")) * 0.05f); - tmservice._setNightcore(_tmpFloat); + //tmservice._setNightcore(_tmpFloat); } else { data.edit().putString("nightcore", "0").commit(); image_nightcore.setAlpha((float) (0.5d)); _customSnack("Android Lollipop or lower doesn't support nightcore feature!", 2); } } - tmservice._requestFocus(); + //tmservice._requestFocus(); _CoreProgressLoading(false); _refreshLikes(); if (openNum == 0) { @@ -2748,8 +2746,9 @@ private void _mpErrorListener(final String _errorMsg) { obj.setDuration(500); obj.start(); _customNav(theme_map.get(0).get("colorBackground").toString()); - tmservice._removeFocus(); - tmservice._resetMp(); + //tmservice._removeFocus(); + //tmservice._resetMp(); + zz.clear(); currentlyMap.clear(); currentlyChild.clear(); } @@ -2776,8 +2775,9 @@ private void _mpCompletionListener() { obj.setDuration(500); obj.start(); _customNav(theme_map.get(0).get("colorBackground").toString()); - tmservice._removeFocus(); - tmservice._resetMp(); + //tmservice._removeFocus(); + //tmservice._resetMp(); + zz.clear(); currentlyMap.clear(); currentlyChild.clear(); } @@ -2790,8 +2790,9 @@ private void _mpCompletionListener() { } } else { if (data.getString("fvsAsc", "").equals("2")) { - tmservice._mpSeek(0); - tmservice._mpStart(); + //tmservice._mpSeek(0); + //tmservice._mpStart(); + zz.requestAction("restart-song"); upload_map = new HashMap<>(); upload_map = currentlyMap.get((int) _position); upload_map.put("view", String.valueOf((long) (Double.parseDouble(upload_map.get("view").toString()) + 1))); @@ -2805,9 +2806,9 @@ private void _mpCompletionListener() { private void _updateTime() { try { - if (tmservice._isPlaying()) { + if (zz.isPlaying()) { image_play.setImageResource(R.drawable.ic_pause_white); - seekbar1.setProgress(tmservice._getCurrentDuration() / 1000); + seekbar1.setProgress(zz.getCurrentDuration() / 1000); } else { image_play.setImageResource(R.drawable.ic_play_arrow_white); } @@ -2827,23 +2828,24 @@ private void _handleMpError(final String _msg) { obj.setDuration(500); obj.start(); _customNav(theme_map.get(0).get("colorBackground").toString()); - tmservice._removeFocus(); - tmservice._resetMp(); + //tmservice._removeFocus(); + //tmservice._resetMp(); + zz.requestAction("reset"); currentlyMap.clear(); currentlyChild.clear(); } private void _bindSvc() { - if (tmservice == null) { + /*if (tmservice == null) { Intent svcintent = new Intent(StreamerActivity.this, ZryteZeneService.class); bindService(svcintent, serviceConnection, Context.BIND_AUTO_CREATE); - } + }*/ } private void _unbindSvc() { - if (tmservice != null) { + /*if (tmservice != null) { unbindService(serviceConnection); - } + }*/ } @Deprecated diff --git a/app/src/main/java/tw/music/streamer/adaptor/ZryteZeneAdaptor.java b/app/src/main/java/tw/music/streamer/adaptor/ZryteZeneAdaptor.java index 9d0e654..091eedc 100644 --- a/app/src/main/java/tw/music/streamer/adaptor/ZryteZeneAdaptor.java +++ b/app/src/main/java/tw/music/streamer/adaptor/ZryteZeneAdaptor.java @@ -4,9 +4,49 @@ import tw.music.streamer.service.ZryteZenePlay; -public class ZryteZeneAdaptor { //line 769 +public class ZryteZeneAdaptor { + + private boolean isr, isp; + private int cd; public void ZryteZeneAdaptor() { + isr = false; + isp = false; + cd = 0; + } + + public void setRunning(boolean a) { + isr = a; + } + + public boolean isRunning() { + return isr; + } + + public void setPlaying(boolean a) { + isp = a; + } + + public boolean isPlaying() { + return isp; + } + + public void setCurrentDuration(int a) { + cd = a; + } + + public int getCurrentDuration() { + return cd; + } + + public void clear() { + requestAction("stop","-"); + } + + public void requestAction(String a) { + Intent jof = new Intent(getApplicationContext(), ZryteZenePlay.class); + jof.putExtra("action", a); + sendBroadcast(jof); } public void requestAction(String a, int b) { diff --git a/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java b/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java index 0e9d5f0..6c483ff 100644 --- a/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java +++ b/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java @@ -19,7 +19,7 @@ public class ZryteZenePlay extends Service implements MediaPlayer.OnPreparedList private MediaPlayer mp; private IntentFilter ief; private SharedPreferences sp; - private String lm, act; + private String lm, act, csp; @Override public void onCreate() { @@ -58,17 +58,24 @@ public void onReceive(Context a, Intent b) { act = b.getStringExtra("action"); if (act.equals("seek")) { seekSong(b); + } else if (act.equals("play")) { + playSong(b); } else if (act.equals("pause")) { pauseSong(); } else if (act.equals("resume")) { resumeSong(); + } else if (act.equals("stop")) { + stopSong(); } else if (act.equals("prev-song")) { playPreviousSong(); } else if (act.equals("next-song")) { playNextSong(); } else if (act.equals("update-sp")) { - String c = b.getStringData("req-data"); - updateSP(c); + updateSP(b); + } else if (act.equals("restart-song")) { + restartSong(); + } else if (act.equals("reset")) { + resetMedia(); } } } @@ -105,20 +112,21 @@ private void applyMediaListener() { mp.setOnErrorListener(this); } - private void playSong(String a) { + private void playSong(Intent a) { + csp = a.getStringData("req-data"); mp = new MediaPlayer(); mp.setAudioStreamType(AudioManager.STREAM_MUSIC); - mp.setDataSource(a); + mp.setDataSource(csp); applyMediaListener(); mp.prepareAsync(); - tellActivity("request-play","1"); + tellActivity("request-play"); } private void pauseSong() { if (mp==null) return; if (mp.isPlaying()) { mp.pause(); - tellActivity("request-pause","1"); + tellActivity("request-pause"); } } @@ -126,7 +134,7 @@ private void resumeSong() { if (mp==null) return; if (mp.isPlaying()) { mp.resume(); - tellActivity("request-resume","1"); + tellActivity("request-resume"); } } @@ -134,7 +142,7 @@ private void stopSong() { if (mp==null) return; if (mp.isPlaying()) { mp.stop(); - tellActivity("request-stop","1"); + tellActivity("request-stop"); } } @@ -142,10 +150,29 @@ private void seekSong(Intent a) { if (mp==null) return; if (mp.isPlaying()) { mp.seekTo(a.getIntExtra("req-data",0)); - tellActivity("request-seek","1"); + tellActivity("request-seek"); } } + private void restartSong() { + if (mp==null) return; + if (mp.isPlaying()) mp.stop(); + mp.seekTo(0); + mp.start(); + tellActivity("request-restart"); // tambahin di streameractivity.java + } + + private void resetMedia() { + mp = new MediaPlayer(); + tellActivity("request-reset") // tambahin di streameractivity.java + } + + private void tellActivity(String a) { + ita = new Intent("tw.music.streamer.STATUS_UPDATE"); + ita.putExtra("update", a); + sendBroadcast(ita); + } + private void tellActivity(String a, String b) { ita = new Intent("tw.music.streamer.STATUS_UPDATE"); ita.putExtra("update", a); @@ -153,8 +180,9 @@ private void tellActivity(String a, String b) { sendBroadcast(ita); } - private void updateSP(String a) { - if (a.equals("loop")) { + private void updateSP(Intent a) { + String b = a.getStringData("req-data"); + if (b.equals("loop")) { lm = sp.getString("fvsAsc", ""); } } From 7a22652fb74d2bdcd43ae1d67d9ce14c1924c8e8 Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Fri, 3 Jan 2025 19:15:29 +0000 Subject: [PATCH 09/37] please work --- .../tw/music/streamer/StreamerActivity.java | 27 ++++++++++++++++--- .../streamer/adaptor/ZryteZeneAdaptor.java | 16 ++++++++++- .../music/streamer/service/ZryteZenePlay.java | 16 ++++++++--- 3 files changed, 50 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/tw/music/streamer/StreamerActivity.java b/app/src/main/java/tw/music/streamer/StreamerActivity.java index f8a4f1b..da133e1 100644 --- a/app/src/main/java/tw/music/streamer/StreamerActivity.java +++ b/app/src/main/java/tw/music/streamer/StreamerActivity.java @@ -449,6 +449,10 @@ public void onClick(View _v) { Auth = FirebaseAuth.getInstance(); d = new AlertDialog.Builder(this); zz = new ZryteZeneAdaptor(); + IntentFilter iaos = new IntentFilter("tw.music.streamer.STATUS_UPDATE"); + registerReceiver(brr, iaos); + Intent siop = new Intent(getApplicationContext(), tw.music.streamer.service.ZryteZenePlay.class); + startService(siop); image_drawer.setOnClickListener(new View.OnClickListener() { @Override @@ -4635,7 +4639,7 @@ protected void setResource(Bitmap resource) { linear_base.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View _view) { - if (tmservice != null) { + //if (tmservice != null) { currentlyMap.clear(); currentlyChild.clear(); for (int _repeat244 = 0; _repeat244 < upload_list.size(); _repeat244++) { @@ -4649,7 +4653,7 @@ public void onClick(View _view) { currentlyChild.add(childkey.get(currentlyChild.size())); } _play(currentlyChild.get(_position)); - } + //} } }); linear_base.setOnLongClickListener(new View.OnLongClickListener() { @@ -4757,26 +4761,41 @@ public void onReceive(Context a, Intent b) { String c = b.getStringExtra("update"); switch (c) { case "on-prepared": + zz.setRunning(true); break; case "on-bufferupdate": + int apdf = b.getIntExtra("data"); + zz.setBufferingUpdate(apdf); break; case "on-completion": + zz.setPlaying(false); break; case "on-error": + String apdf = b.getExtra("data"); + zz.addError(apdf) + zz.setPlaying(false); break; case "request-play": + zz.setPlaying(true); break; case "request-pause": + zz.setPlaying(false); break; case "request-resume": + zz.setPlaying(true); break; case "request-stop": + zz.setPlaying(false); break; case "request-seek": + int apdf = b.getIntExtra("data"); + zz.setCurrentDuration(apdf); break; - case "request-prevsong": + case "request-restart": + zz.setPlaying(true); break; - case "request-nextsong": + case "request-reset": + zz.setPlaying(false); break; } } diff --git a/app/src/main/java/tw/music/streamer/adaptor/ZryteZeneAdaptor.java b/app/src/main/java/tw/music/streamer/adaptor/ZryteZeneAdaptor.java index 091eedc..2902482 100644 --- a/app/src/main/java/tw/music/streamer/adaptor/ZryteZeneAdaptor.java +++ b/app/src/main/java/tw/music/streamer/adaptor/ZryteZeneAdaptor.java @@ -7,12 +7,14 @@ public class ZryteZeneAdaptor { private boolean isr, isp; - private int cd; + private int cd, bu; + private ArrayList e; public void ZryteZeneAdaptor() { isr = false; isp = false; cd = 0; + e = new ArrayList<>(); } public void setRunning(boolean a) { @@ -39,10 +41,22 @@ public int getCurrentDuration() { return cd; } + public void setBufferingUpdate(int a) { + bu = a; + } + + public int getBufferingUpdate() { + return bu; + } + public void clear() { requestAction("stop","-"); } + public void addError(String a) { + e.add(a); + } + public void requestAction(String a) { Intent jof = new Intent(getApplicationContext(), ZryteZenePlay.class); jof.putExtra("action", a); diff --git a/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java b/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java index 6c483ff..42574ba 100644 --- a/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java +++ b/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java @@ -149,8 +149,9 @@ private void stopSong() { private void seekSong(Intent a) { if (mp==null) return; if (mp.isPlaying()) { - mp.seekTo(a.getIntExtra("req-data",0)); - tellActivity("request-seek"); + int b = a.getIntExtra("req-data",0); + mp.seekTo(b); + tellActivity("request-seek", b); } } @@ -159,12 +160,12 @@ private void restartSong() { if (mp.isPlaying()) mp.stop(); mp.seekTo(0); mp.start(); - tellActivity("request-restart"); // tambahin di streameractivity.java + tellActivity("request-restart"); } private void resetMedia() { mp = new MediaPlayer(); - tellActivity("request-reset") // tambahin di streameractivity.java + tellActivity("request-reset"); } private void tellActivity(String a) { @@ -180,6 +181,13 @@ private void tellActivity(String a, String b) { sendBroadcast(ita); } + private void tellActivity(String a, int b) { + ita = new Intent("tw.music.streamer.STATUS_UPDATE"); + ita.putExtra("update", a); + ita.putExtra("data", b); + sendBroadcast(ita); + } + private void updateSP(Intent a) { String b = a.getStringData("req-data"); if (b.equals("loop")) { From 2e0a71ad02c6cfb0c0c9086f1c41e0d4b2199351 Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Sat, 4 Jan 2025 02:40:51 +0000 Subject: [PATCH 10/37] added things that i always forgot haiyyaa -> Intent --- app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java b/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java index 42574ba..98f6dc8 100644 --- a/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java +++ b/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java @@ -20,6 +20,7 @@ public class ZryteZenePlay extends Service implements MediaPlayer.OnPreparedList private IntentFilter ief; private SharedPreferences sp; private String lm, act, csp; + private Intent ita; @Override public void onCreate() { From 5646879ddb3820f4f6921c3cc8c77edde69d0542 Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Sat, 4 Jan 2025 02:43:44 +0000 Subject: [PATCH 11/37] ok now it should works --- .../java/tw/music/streamer/service/ZryteZenePlay.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java b/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java index 98f6dc8..565da8a 100644 --- a/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java +++ b/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java @@ -79,7 +79,7 @@ public void onReceive(Context a, Intent b) { resetMedia(); } } - } + }; ief = new IntentFilter("tw.music.streamer.ACTION"); registerReceiver(br, ief); applyMediaListener(); @@ -114,7 +114,7 @@ private void applyMediaListener() { } private void playSong(Intent a) { - csp = a.getStringData("req-data"); + csp = a.getStringExtra("req-data"); mp = new MediaPlayer(); mp.setAudioStreamType(AudioManager.STREAM_MUSIC); mp.setDataSource(csp); @@ -134,7 +134,7 @@ private void pauseSong() { private void resumeSong() { if (mp==null) return; if (mp.isPlaying()) { - mp.resume(); + mp.start(); tellActivity("request-resume"); } } @@ -190,7 +190,7 @@ private void tellActivity(String a, int b) { } private void updateSP(Intent a) { - String b = a.getStringData("req-data"); + String b = a.getStringExtra("req-data"); if (b.equals("loop")) { lm = sp.getString("fvsAsc", ""); } From e81fcc0ceba8c95708c104dbed0318dbf1592198 Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Sat, 4 Jan 2025 02:45:46 +0000 Subject: [PATCH 12/37] f --- .../main/java/tw/music/streamer/service/ZryteZenePlay.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java b/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java index 565da8a..9c0d19e 100644 --- a/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java +++ b/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java @@ -67,10 +67,6 @@ public void onReceive(Context a, Intent b) { resumeSong(); } else if (act.equals("stop")) { stopSong(); - } else if (act.equals("prev-song")) { - playPreviousSong(); - } else if (act.equals("next-song")) { - playNextSong(); } else if (act.equals("update-sp")) { updateSP(b); } else if (act.equals("restart-song")) { From 5e4872f5edaa952125038bc31deea5f39caaa60f Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Sat, 4 Jan 2025 02:47:57 +0000 Subject: [PATCH 13/37] ff --- .../tw/music/streamer/service/ZryteZenePlay.java | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java b/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java index 9c0d19e..4196129 100644 --- a/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java +++ b/app/src/main/java/tw/music/streamer/service/ZryteZenePlay.java @@ -113,10 +113,15 @@ private void playSong(Intent a) { csp = a.getStringExtra("req-data"); mp = new MediaPlayer(); mp.setAudioStreamType(AudioManager.STREAM_MUSIC); - mp.setDataSource(csp); - applyMediaListener(); - mp.prepareAsync(); - tellActivity("request-play"); + try { + mp.setDataSource(csp); + } catch (Exception e) { + tellActivity("on-error", e.toString()); + } finally { + applyMediaListener(); + mp.prepareAsync(); + tellActivity("request-play"); + } } private void pauseSong() { From b7f99dd631637eb9e50a665c00ffc19fbfc846e9 Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Sat, 4 Jan 2025 02:58:01 +0000 Subject: [PATCH 14/37] just compile it goddamit --- .../java/tw/music/streamer/StreamerActivity.java | 2 +- .../tw/music/streamer/adaptor/ZryteZeneAdaptor.java | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/tw/music/streamer/StreamerActivity.java b/app/src/main/java/tw/music/streamer/StreamerActivity.java index da133e1..6905c28 100644 --- a/app/src/main/java/tw/music/streamer/StreamerActivity.java +++ b/app/src/main/java/tw/music/streamer/StreamerActivity.java @@ -448,7 +448,7 @@ public void onClick(View _v) { data = getSharedPreferences("teamdata", Activity.MODE_PRIVATE); Auth = FirebaseAuth.getInstance(); d = new AlertDialog.Builder(this); - zz = new ZryteZeneAdaptor(); + zz = new ZryteZeneAdaptor(this); IntentFilter iaos = new IntentFilter("tw.music.streamer.STATUS_UPDATE"); registerReceiver(brr, iaos); Intent siop = new Intent(getApplicationContext(), tw.music.streamer.service.ZryteZenePlay.class); diff --git a/app/src/main/java/tw/music/streamer/adaptor/ZryteZeneAdaptor.java b/app/src/main/java/tw/music/streamer/adaptor/ZryteZeneAdaptor.java index 2902482..d7e8b17 100644 --- a/app/src/main/java/tw/music/streamer/adaptor/ZryteZeneAdaptor.java +++ b/app/src/main/java/tw/music/streamer/adaptor/ZryteZeneAdaptor.java @@ -1,6 +1,9 @@ package tw.music.streamer.adaptor; import android.content.Intent; +import android.content.Context; + +import java.util.ArrayList; import tw.music.streamer.service.ZryteZenePlay; @@ -9,12 +12,14 @@ public class ZryteZeneAdaptor { private boolean isr, isp; private int cd, bu; private ArrayList e; + private Context ctx; - public void ZryteZeneAdaptor() { + public ZryteZeneAdaptor(Context a) { isr = false; isp = false; cd = 0; e = new ArrayList<>(); + ctx = a; } public void setRunning(boolean a) { @@ -60,20 +65,20 @@ public void addError(String a) { public void requestAction(String a) { Intent jof = new Intent(getApplicationContext(), ZryteZenePlay.class); jof.putExtra("action", a); - sendBroadcast(jof); + ctx.sendBroadcast(jof); } public void requestAction(String a, int b) { Intent jof = new Intent(getApplicationContext(), ZryteZenePlay.class); jof.putExtra("action", a); jof.putExtra("req-data", b); - sendBroadcast(jof); + ctx.sendBroadcast(jof); } public void requestAction(String a, String b) { Intent jof = new Intent(getApplicationContext(), ZryteZenePlay.class); jof.putExtra("action", a); jof.putExtra("req-data", b); - sendBroadcast(jof); + ctx.sendBroadcast(jof); } } \ No newline at end of file From bf88f0c1c54b3c626111c06eea6fc8f97bc3f484 Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Sat, 4 Jan 2025 03:00:04 +0000 Subject: [PATCH 15/37] removed getApplicationContext() --- .../java/tw/music/streamer/adaptor/ZryteZeneAdaptor.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/tw/music/streamer/adaptor/ZryteZeneAdaptor.java b/app/src/main/java/tw/music/streamer/adaptor/ZryteZeneAdaptor.java index d7e8b17..dd01d11 100644 --- a/app/src/main/java/tw/music/streamer/adaptor/ZryteZeneAdaptor.java +++ b/app/src/main/java/tw/music/streamer/adaptor/ZryteZeneAdaptor.java @@ -63,20 +63,20 @@ public void addError(String a) { } public void requestAction(String a) { - Intent jof = new Intent(getApplicationContext(), ZryteZenePlay.class); + Intent jof = new Intent(ctx, ZryteZenePlay.class); jof.putExtra("action", a); ctx.sendBroadcast(jof); } public void requestAction(String a, int b) { - Intent jof = new Intent(getApplicationContext(), ZryteZenePlay.class); + Intent jof = new Intent(ctx, ZryteZenePlay.class); jof.putExtra("action", a); jof.putExtra("req-data", b); ctx.sendBroadcast(jof); } public void requestAction(String a, String b) { - Intent jof = new Intent(getApplicationContext(), ZryteZenePlay.class); + Intent jof = new Intent(ctx, ZryteZenePlay.class); jof.putExtra("action", a); jof.putExtra("req-data", b); ctx.sendBroadcast(jof); From 4ac38740ea3a25fdb1ffcc42d98bd19237e4afb9 Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Sat, 4 Jan 2025 03:18:29 +0000 Subject: [PATCH 16/37] added filter in onReceive --- app/src/main/java/tw/music/streamer/StreamerActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/tw/music/streamer/StreamerActivity.java b/app/src/main/java/tw/music/streamer/StreamerActivity.java index 6905c28..cc279d6 100644 --- a/app/src/main/java/tw/music/streamer/StreamerActivity.java +++ b/app/src/main/java/tw/music/streamer/StreamerActivity.java @@ -4758,6 +4758,7 @@ public void onClick(DialogInterface _dialog, int _which) { private BroadcastReceiver brr = new BroadcastReceiver() { @Override public void onReceive(Context a, Intent b) { + if (zz==null || !zz.isRunning) return; String c = b.getStringExtra("update"); switch (c) { case "on-prepared": From 1bf3ad5fec5d380050154723227ef84d6ac176b4 Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Sat, 4 Jan 2025 03:19:46 +0000 Subject: [PATCH 17/37] i forgot to put a fckng ; --- app/src/main/java/tw/music/streamer/StreamerActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/tw/music/streamer/StreamerActivity.java b/app/src/main/java/tw/music/streamer/StreamerActivity.java index cc279d6..26f9733 100644 --- a/app/src/main/java/tw/music/streamer/StreamerActivity.java +++ b/app/src/main/java/tw/music/streamer/StreamerActivity.java @@ -4758,7 +4758,7 @@ public void onClick(DialogInterface _dialog, int _which) { private BroadcastReceiver brr = new BroadcastReceiver() { @Override public void onReceive(Context a, Intent b) { - if (zz==null || !zz.isRunning) return; + if (zz==null) return; String c = b.getStringExtra("update"); switch (c) { case "on-prepared": @@ -4773,7 +4773,7 @@ public void onReceive(Context a, Intent b) { break; case "on-error": String apdf = b.getExtra("data"); - zz.addError(apdf) + zz.addError(apdf); zz.setPlaying(false); break; case "request-play": From 8a0e6100dd662e8ff4b61debd9f646d1f217aa9b Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Sat, 4 Jan 2025 10:58:13 +0700 Subject: [PATCH 18/37] Create android.yml --- .github/workflows/android.yml | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/android.yml diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml new file mode 100644 index 0000000..2f633b6 --- /dev/null +++ b/.github/workflows/android.yml @@ -0,0 +1,26 @@ +name: Android CI + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: set up JDK 11 + uses: actions/setup-java@v4 + with: + java-version: '11' + distribution: 'temurin' + cache: gradle + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Build with Gradle + run: ./gradlew build From 9304dcf78f849a78cbcada61e86c50873e03a9ff Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Sat, 4 Jan 2025 14:29:18 +0700 Subject: [PATCH 19/37] fix permission issue for android 13 and higher, changed gradle build to latest 4.2 --- .idea/gradle.xml | 7 +++---- .idea/misc.xml | 2 +- .idea/runConfigurations.xml | 8 ++++++++ app/build.gradle | 4 ++-- .../main/java/tw/music/streamer/MainActivity.java | 6 +++++- .../java/tw/music/streamer/StreamerActivity.java | 12 +++++++----- .../main/java/tw/music/streamer/WizardActivity.java | 6 +++++- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- 9 files changed, 33 insertions(+), 16 deletions(-) diff --git a/.idea/gradle.xml b/.idea/gradle.xml index ac6b0ae..7b3006b 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,17 +4,16 @@ diff --git a/.idea/misc.xml b/.idea/misc.xml index 37a7509..1776bbc 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml index 7f68460..72f00ed 100644 --- a/.idea/runConfigurations.xml +++ b/.idea/runConfigurations.xml @@ -3,6 +3,14 @@