From ced8b8734c4ccd675b5536397d9000498da8dfb3 Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Thu, 23 Jan 2025 12:22:53 +0700 Subject: [PATCH 01/10] removed animators since its gives error for A14 --- .../java/tw/music/streamer/MainActivity.java | 40 +++++-------------- 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/app/src/main/java/tw/music/streamer/MainActivity.java b/app/src/main/java/tw/music/streamer/MainActivity.java index 54f3ca4..99c185c 100644 --- a/app/src/main/java/tw/music/streamer/MainActivity.java +++ b/app/src/main/java/tw/music/streamer/MainActivity.java @@ -464,7 +464,7 @@ public void onCancelled(DatabaseError _param1) { }; prof_img.addChildEventListener(_prof_img_child_listener); - objectanim3.addListener(new Animator.AnimatorListener() { + /*objectanim3.addListener(new Animator.AnimatorListener() { @Override public void onAnimationStart(Animator _param1) { @@ -484,7 +484,7 @@ public void onAnimationCancel(Animator _param1) { public void onAnimationRepeat(Animator _param1) { } - }); + });*/ _internetchecker_request_listener = new RequestNetwork.RequestListener() { @Override @@ -500,12 +500,13 @@ public void run() { runOnUiThread(new Runnable() { @Override public void run() { - objectanim3.setTarget(linear4); + /*objectanim3.setTarget(linear4); objectanim3.setPropertyName("translationY"); objectanim3.setFloatValues(SketchwareUtil.getDip(getApplicationContext(), -75), (float) (0)); objectanim3.setDuration(500); objectanim3.setInterpolator(new DecelerateInterpolator()); - objectanim3.start(); + objectanim3.start();*/ + internetchecker.startRequestNetwork(RequestNetworkController.GET, "https://www.google.com", "A", _internetchecker_request_listener); } }); } @@ -526,12 +527,13 @@ public void onErrorResponse(String _param1, String _param2) { _isNoInternet = true; textview4.setText("Please enable your internet!"); _randomEmoteUwU(); - objectanim3.setTarget(linear4); + /*objectanim3.setTarget(linear4); objectanim3.setPropertyName("translationY"); objectanim3.setFloatValues((float) (0), SketchwareUtil.getDip(getApplicationContext(), -75)); objectanim3.setDuration(500); objectanim3.setInterpolator(new DecelerateInterpolator()); - objectanim3.start(); + objectanim3.start();*/ + internetchecker.startRequestNetwork(RequestNetworkController.GET, "https://www.google.com", "A", _internetchecker_request_listener); } } }; @@ -633,7 +635,7 @@ public void onComplete(Task _param1) { } private void initializeLogic() { - overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out); + //overridePendingTransition(android.R.anim.fade_in, android.R.anim.fade_out); try { packageInfo = MainActivity.this.getPackageManager().getPackageInfo(getPackageName(), 0); textview6.setText(" " + packageInfo.versionName); @@ -781,39 +783,17 @@ private void initializeLogic() { imageview1.setImageResource(R.drawable.no_network_emote02); textview11.setText("GIVE ME BACK MY COOKIES!"); } - if (_checkPermission()) { - if (FileUtil.isExistFile(FileUtil.getPackageDataDir(getApplicationContext()).concat("/tmp.png"))) { - FileUtil.deleteFile(FileUtil.getPackageDataDir(getApplicationContext()).concat("/tmp.png")); - } - if (FileUtil.isExistFile(FileUtil.getPackageDataDir(getApplicationContext()).concat("/tmp_user.png"))) { - FileUtil.deleteFile(FileUtil.getPackageDataDir(getApplicationContext()).concat("/tmp_user.png")); - } - if (FileUtil.isExistFile(FileUtil.getPackageDataDir(getApplicationContext()).concat("/tm-testfile"))) { - FileUtil.deleteFile(FileUtil.getPackageDataDir(getApplicationContext()).concat("/tm-testfile")); - } - } _checkCookie(); } private boolean _checkPermission() { if (Build.VERSION.SDK_INT < 33) { - return !(androidx.core.content.ContextCompat.checkSelfPermission(this, android.Manifest.permission.READ_EXTERNAL_STORAGE) == android.content.pm.PackageManager.PERMISSION_DENIED || androidx.core.content.ContextCompat.checkSelfPermission(this, android.Manifest.permission.WRITE_EXTERNAL_STORAGE) == android.content.pm.PackageManager.PERMISSION_DENIED); + return !(androidx.core.content.ContextCompat.checkSelfPermission(this, android.Manifest.permission.READ_EXTERNAL_STORAGE) == android.content.pm.PackageManager.PERMISSION_DENIED); } else { return true; } } - @Override - protected void onActivityResult(int _requestCode, int _resultCode, Intent _data) { - super.onActivityResult(_requestCode, _resultCode, _data); - - switch (_requestCode) { - - default: - break; - } - } - @Override public void onBackPressed() { From 5c9a0536e4d781097779e812205eb5b3e1c2603b Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Thu, 23 Jan 2025 12:26:40 +0700 Subject: [PATCH 02/10] added needed permissions for A14 --- app/src/main/AndroidManifest.xml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index cd267f0..1ceb197 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,12 +3,14 @@ - - - - - - + + + + + + + + Date: Thu, 23 Jan 2025 12:33:11 +0700 Subject: [PATCH 03/10] fix mp_play onClick issue --- .../java/tw/music/streamer/StreamingActivity.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/app/src/main/java/tw/music/streamer/StreamingActivity.java b/app/src/main/java/tw/music/streamer/StreamingActivity.java index c989d74..907e7bf 100644 --- a/app/src/main/java/tw/music/streamer/StreamingActivity.java +++ b/app/src/main/java/tw/music/streamer/StreamingActivity.java @@ -198,6 +198,16 @@ public void onClick(View b) { openMenuBar(4,true); } }); + mp_play.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View b) { + if (zz.isPlaying()) { + zz.requestAction("pause"); + } else { + zz.requestAction("resume"); + } + } + }) } private void initLogic(final Context a) { @@ -244,8 +254,10 @@ public void onReceive(Context context, Intent intent) { mp_bar.setProgress(zz.getCurrentDuration()/1000); } else if (m.equals("on-completion")) { zz.setPlaying(false); + mp_play.setImageResource(R.drawable.ic_play_arrow_white); } else if (m.equals("on-error")) { zz.addError(intent.getStringExtra("data")); + mp_play.setImageResource(R.drawable.ic_play_arrow_white); } else if (m.equals("on-seekerror")) { } else if (m.equals("on-initialized")) { } else if (m.equals("on-bufferupdate")) { @@ -253,10 +265,13 @@ public void onReceive(Context context, Intent intent) { } else if (m.equals("request-play")) { } else if (m.equals("request-pause")) { zz.setPlaying(false); + mp_play.setImageResource(R.drawable.ic_play_arrow_white); } else if (m.equals("request-resume")) { zz.setPlaying(true); + mp_play.setImageResource(R.drawable.ic_pause_white); } else if (m.equals("request-stop")) { zz.setPlaying(false); + mp_play.setImageResource(R.drawable.ic_play_arrow_white); } else if (m.equals("request-seek")) { zz.setCurrentDuration(intent.getIntExtra("data",0)/1000); } else if (m.equals("request-restart")) { From 1e2cc42fe7313fe5b792868f09256ae0cc2fdf55 Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Thu, 23 Jan 2025 12:44:48 +0700 Subject: [PATCH 04/10] music control switched to ZryteZeneBroadcastReceiver --- .../streamer/notification/ZryteZeneNotification.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/tw/music/streamer/notification/ZryteZeneNotification.java b/app/src/main/java/tw/music/streamer/notification/ZryteZeneNotification.java index 2e35715..481d2e9 100644 --- a/app/src/main/java/tw/music/streamer/notification/ZryteZeneNotification.java +++ b/app/src/main/java/tw/music/streamer/notification/ZryteZeneNotification.java @@ -82,9 +82,9 @@ public static void updateWithMedia(Context a, boolean b, MediaSessionCompat c, S manager.createNotificationChannel(channel); } - Intent playPauseIntent = new Intent(a, ZryteZenePlay.class).putExtra("action", b ? "pause" : "resume"); //setAction(ZryteZenePlay.ACTION_BROADCAST). - Intent previousIntent = new Intent(a, ZryteZenePlay.class).putExtra("action", "previous"); - Intent nextIntent = new Intent(a, ZryteZenePlay.class).putExtra("action", "forward"); + Intent playPauseIntent = new Intent(a, ZryteZeneBroadcastReceiver.class).setAction(b ? ZryteZeneBroadcastReceiver.PAUSE : ZryteZeneBroadcastReceiver.PLAY); + Intent previousIntent = new Intent(a, ZryteZeneBroadcastReceiver.class).setAction(ZryteZeneBroadcastReceiver.PREVIOUS); + Intent nextIntent = new Intent(a, ZryteZeneBroadcastReceiver.class).setAction(ZryteZeneBroadcastReceiver.SKIP); PendingIntent playPausePendingIntent = PendingIntent.getService(a, 0, playPauseIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); PendingIntent previousPendingIntent = PendingIntent.getService(a, 0, previousIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); PendingIntent nextPendingIntent = PendingIntent.getService(a, 0, nextIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); @@ -101,6 +101,7 @@ public static void updateWithMedia(Context a, boolean b, MediaSessionCompat c, S .addAction(android.R.drawable.ic_media_previous, "Previous", previousPendingIntent) .addAction(b ? android.R.drawable.ic_media_pause : android.R.drawable.ic_media_play, "Play/Pause", playPausePendingIntent) .addAction(android.R.drawable.ic_media_next, "Next", nextPendingIntent) + .setVisibility(NotificationCompat.VISIBILITY_PUBLIC) .setPriority(NotificationCompat.PRIORITY_LOW) .setOngoing(true) .build(); @@ -116,6 +117,7 @@ public static void updateWithMedia(Context a, boolean b, MediaSessionCompat c, S .addAction(android.R.drawable.ic_media_previous, "Previous", previousPendingIntent) .addAction(b ? android.R.drawable.ic_media_pause : android.R.drawable.ic_media_play, "Play/Pause", playPausePendingIntent) .addAction(android.R.drawable.ic_media_next, "Next", nextPendingIntent) + .setVisibility(NotificationCompat.VISIBILITY_PUBLIC) .setPriority(NotificationCompat.PRIORITY_LOW) .setOngoing(true) .build(); From 03987c1ce8f144544f15d72031c4285402fefd92 Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Thu, 23 Jan 2025 12:46:58 +0700 Subject: [PATCH 05/10] added intent filter for ZZ broadcast receiver --- app/src/main/AndroidManifest.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1ceb197..070702e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -118,5 +118,14 @@ android:label="ZryteZene Background Service" android:exported="true"/> + + + + + + + + + \ No newline at end of file From 816644aebeab84b9b02ff835d396e11ff13b0dba Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Thu, 23 Jan 2025 12:53:47 +0700 Subject: [PATCH 06/10] added send broadcast to ZZPlay --- .../receiver/ZryteZeneBroadcastReceiver.java | 61 ++++++++----------- 1 file changed, 26 insertions(+), 35 deletions(-) diff --git a/app/src/main/java/tw/music/streamer/receiver/ZryteZeneBroadcastReceiver.java b/app/src/main/java/tw/music/streamer/receiver/ZryteZeneBroadcastReceiver.java index e212457..7037e48 100644 --- a/app/src/main/java/tw/music/streamer/receiver/ZryteZeneBroadcastReceiver.java +++ b/app/src/main/java/tw/music/streamer/receiver/ZryteZeneBroadcastReceiver.java @@ -3,46 +3,37 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import android.util.Log; -import tw.music.streamer.service.ZryteZenePlay; +import tw.music.streamer.adaptor.ZryteZeneAdaptor; public class ZryteZeneBroadcastReceiver extends BroadcastReceiver { - public static final String PLAY = "tw.music.streamer.ACTION_PLAY"; - public static final String PAUSE = "tw.music.streamer.ACTION_PAUSE"; - public static final String NEXT = "tw.music.streamer.ACTION_NEXT"; - public static final String PREVIOUS = "tw.music.streamer.ACTION_PREVIOUS"; + public static final String PLAY = "ZZ_PLAY"; + public static final String PAUSE = "ZZ_PAUSE"; + public static final String SKIP = "ZZ_SKIP"; + public static final String PREVIOUS = "ZZ_PREVIOUS"; - @Override - public void onReceive(Context a, Intent b) { - if (b == null || b.getAction() == null) return; - - String c = b.getAction(); - Intent d = new Intent(a, ZryteZenePlay.class); - - switch (c) { - case PLAY: - d.putExtra("action", "play"); - break; - - case PAUSE: - d.putExtra("action", "pause"); - break; + public ZryteZeneAdaptor zz; - case NEXT: - d.putExtra("action", "next"); - break; - - case PREVIOUS: - d.putExtra("action", "previous"); - break; - - default: - Log.w("MusicBroadcastReceiver", "Unknown action: " + c); - return; + @Override + public void onReceive(Context context, Intent intent) { + zz = new ZryteZeneAdaptor(context); + String action = intent.getAction(); + if (action != null) { + switch (action) { + case PLAY: + zz.requestAction("resume"); + break; + case PAUSE: + zz.requestAction("pause"); + break; + case SKIP: + zz.requestAction("skip"); + break; + case PREVIOUS: + zz.requestAction("previous"); + break; + } } - - a.startService(d); } -} +} \ No newline at end of file From 45cdbdf74d7b11bc11a57df37d500a6f3c4ca872 Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Thu, 23 Jan 2025 12:55:08 +0700 Subject: [PATCH 07/10] added zzbroadcastreceiver import --- .../music/streamer/notification/ZryteZeneNotification.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/tw/music/streamer/notification/ZryteZeneNotification.java b/app/src/main/java/tw/music/streamer/notification/ZryteZeneNotification.java index 481d2e9..460b929 100644 --- a/app/src/main/java/tw/music/streamer/notification/ZryteZeneNotification.java +++ b/app/src/main/java/tw/music/streamer/notification/ZryteZeneNotification.java @@ -24,8 +24,9 @@ import com.bumptech.glide.request.target.CustomTarget; import com.bumptech.glide.request.transition.Transition; +import tw.music.streamer.receiver.ZryteZeneBroadcastReceiver; import tw.music.streamer.service.ZryteZenePlay; -import tw.music.streamer.StreamerActivity; +import tw.music.streamer.StreamingActivity; public class ZryteZeneNotification { @@ -43,7 +44,7 @@ public static Notification setup(Context a) { mr.createNotificationChannel(ch); } - Intent openAppIntent = new Intent(a, StreamerActivity.class); + Intent openAppIntent = new Intent(a, StreamingActivity.class); PendingIntent openAppPendingIntent = PendingIntent.getActivity(a, 0, openAppIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); Notification notification = new Notification.Builder(a, ZryteZenePlay.CHANNEL_ID) From dbf5d90c552a77354ed6ee104220a8527fc018b3 Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Thu, 23 Jan 2025 12:59:00 +0700 Subject: [PATCH 08/10] added android:exported --- app/src/main/AndroidManifest.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 070702e..3d48adf 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -118,7 +118,9 @@ android:label="ZryteZene Background Service" android:exported="true"/> - + From 5f0d72ad12b70a3821f70f1d877263f09c2cd467 Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Thu, 23 Jan 2025 13:00:40 +0700 Subject: [PATCH 09/10] always forgot to put ; fckkk java --- app/src/main/java/tw/music/streamer/StreamingActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/tw/music/streamer/StreamingActivity.java b/app/src/main/java/tw/music/streamer/StreamingActivity.java index 907e7bf..310927f 100644 --- a/app/src/main/java/tw/music/streamer/StreamingActivity.java +++ b/app/src/main/java/tw/music/streamer/StreamingActivity.java @@ -207,7 +207,7 @@ public void onClick(View b) { zz.requestAction("resume"); } } - }) + }); } private void initLogic(final Context a) { From d414d7ee993c82204218d0942e33b2509201682f Mon Sep 17 00:00:00 2001 From: AdityaKapal362 Date: Thu, 23 Jan 2025 13:05:05 +0700 Subject: [PATCH 10/10] changed getService to getBroadcast --- .../music/streamer/notification/ZryteZeneNotification.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/tw/music/streamer/notification/ZryteZeneNotification.java b/app/src/main/java/tw/music/streamer/notification/ZryteZeneNotification.java index 460b929..a3394c1 100644 --- a/app/src/main/java/tw/music/streamer/notification/ZryteZeneNotification.java +++ b/app/src/main/java/tw/music/streamer/notification/ZryteZeneNotification.java @@ -86,9 +86,9 @@ public static void updateWithMedia(Context a, boolean b, MediaSessionCompat c, S Intent playPauseIntent = new Intent(a, ZryteZeneBroadcastReceiver.class).setAction(b ? ZryteZeneBroadcastReceiver.PAUSE : ZryteZeneBroadcastReceiver.PLAY); Intent previousIntent = new Intent(a, ZryteZeneBroadcastReceiver.class).setAction(ZryteZeneBroadcastReceiver.PREVIOUS); Intent nextIntent = new Intent(a, ZryteZeneBroadcastReceiver.class).setAction(ZryteZeneBroadcastReceiver.SKIP); - PendingIntent playPausePendingIntent = PendingIntent.getService(a, 0, playPauseIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); - PendingIntent previousPendingIntent = PendingIntent.getService(a, 0, previousIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); - PendingIntent nextPendingIntent = PendingIntent.getService(a, 0, nextIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); + PendingIntent playPausePendingIntent = PendingIntent.getBroadcast(a, 0, playPauseIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); + PendingIntent previousPendingIntent = PendingIntent.getBroadcast(a, 0, previousIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); + PendingIntent nextPendingIntent = PendingIntent.getBroadcast(a, 0, nextIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); Notification nf; if (f == null) {