You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(54) |
Aug
(33) |
Sep
(27) |
Oct
(10) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(7) |
Feb
(5) |
Mar
(7) |
Apr
(1) |
May
(1) |
Jun
(1) |
Jul
(25) |
Aug
(41) |
Sep
(89) |
Oct
(99) |
Nov
(161) |
Dec
(85) |
| 2010 |
Jan
(10) |
Feb
(35) |
Mar
(44) |
Apr
(115) |
May
(98) |
Jun
(87) |
Jul
(23) |
Aug
(27) |
Sep
(63) |
Oct
(57) |
Nov
(97) |
Dec
(62) |
| 2011 |
Jan
(67) |
Feb
(83) |
Mar
(43) |
Apr
(14) |
May
(43) |
Jun
(52) |
Jul
(55) |
Aug
(97) |
Sep
(65) |
Oct
(36) |
Nov
(67) |
Dec
(46) |
| 2012 |
Jan
(29) |
Feb
(24) |
Mar
(10) |
Apr
(2) |
May
(10) |
Jun
(34) |
Jul
(31) |
Aug
(9) |
Sep
(10) |
Oct
(10) |
Nov
(6) |
Dec
(7) |
| 2013 |
Jan
(1) |
Feb
(1) |
Mar
(5) |
Apr
(2) |
May
(17) |
Jun
(10) |
Jul
(8) |
Aug
(17) |
Sep
|
Oct
(3) |
Nov
(4) |
Dec
(1) |
| 2014 |
Jan
(2) |
Feb
(8) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
(5) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
(5) |
Dec
(8) |
| 2015 |
Jan
(1) |
Feb
|
Mar
(4) |
Apr
|
May
(2) |
Jun
(1) |
Jul
(1) |
Aug
|
Sep
(1) |
Oct
|
Nov
(1) |
Dec
|
| 2016 |
Jan
|
Feb
(1) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(2) |
| 2018 |
Jan
|
Feb
(2) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
(4) |
| 2019 |
Jan
(2) |
Feb
|
Mar
(4) |
Apr
(4) |
May
(2) |
Jun
(1) |
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
|
Dec
(4) |
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
(1) |
Jun
(6) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2021 |
Jan
|
Feb
(7) |
Mar
(29) |
Apr
(8) |
May
(7) |
Jun
(45) |
Jul
(66) |
Aug
|
Sep
|
Oct
(2) |
Nov
(37) |
Dec
(34) |
| 2022 |
Jan
(15) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
(10) |
Jul
|
Aug
|
Sep
|
Oct
(5) |
Nov
(1) |
Dec
(7) |
| 2023 |
Jan
(23) |
Feb
(18) |
Mar
(18) |
Apr
(6) |
May
(10) |
Jun
(7) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2024 |
Jan
(11) |
Feb
(3) |
Mar
|
Apr
(6) |
May
(3) |
Jun
|
Jul
|
Aug
(2) |
Sep
(16) |
Oct
(6) |
Nov
(7) |
Dec
(6) |
| 2025 |
Jan
(8) |
Feb
(3) |
Mar
(7) |
Apr
(5) |
May
(21) |
Jun
(10) |
Jul
(16) |
Aug
(5) |
Sep
(19) |
Oct
(2) |
Nov
|
Dec
|
|
From: <yu...@us...> - 2024-12-07 17:03:38
|
Revision: 2811
http://sourceforge.net/p/swingme/code/2811
Author: yuranet
Date: 2024-12-07 17:03:35 +0000 (Sat, 07 Dec 2024)
Log Message:
-----------
more logging
Modified Paths:
--------------
AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/AudioPlayer.java
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/AudioPlayer.java
===================================================================
--- AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/AudioPlayer.java 2024-12-07 16:53:53 UTC (rev 2810)
+++ AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/AudioPlayer.java 2024-12-07 17:03:35 UTC (rev 2811)
@@ -93,7 +93,7 @@
player.prepare();
}
catch (IOException ex) {
- MediaException mex = new MediaException("unable to prepare");
+ MediaException mex = new MediaException("unable to prepare: " + player);
mex.initCause(ex);
throw mex;
}
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2024-12-07 16:53:53 UTC (rev 2810)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2024-12-07 17:03:35 UTC (rev 2811)
@@ -65,6 +65,8 @@
res = new Image(bmp);
if (res.getWidth() != width || res.getHeight() != height) {
+ // example warning print out:
+ // OUT: WARN Image.createImage size does not match in=122x254 out=123x254 for Image{config=ARGB_8888, width=280, height=145, density=240, mutable=false, recycled=false, bitmap=android.graphics.Bitmap@f5236e1}
System.out.println("WARN Image.createImage size does not match in="+width+"x"+height+" out="+res.getWidth()+"x"+res.getHeight() + " for " + image);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-12-07 16:53:55
|
Revision: 2810
http://sourceforge.net/p/swingme/code/2810
Author: yuranet
Date: 2024-12-07 16:53:53 +0000 (Sat, 07 Dec 2024)
Log Message:
-----------
always reset validate state
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/DesktopPane.java
Modified: SwingME/src/net/yura/mobile/gui/DesktopPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/DesktopPane.java 2024-11-28 03:04:23 UTC (rev 2809)
+++ SwingME/src/net/yura/mobile/gui/DesktopPane.java 2024-12-07 16:53:53 UTC (rev 2810)
@@ -574,13 +574,17 @@
// now we need to layout all the components
// we use a 3 pass system, as 3 passes is the maximum needed to layout even
// the most complex layout with flexable components inside scrollpanes
- validating = 1;
- validateComponents(revalidateComponents1);
- validating = 2;
- validateComponents(revalidateComponents2);
- validating = 3;
- validateComponents(revalidateComponents3);
- validating = 0;
+ try {
+ validating = 1;
+ validateComponents(revalidateComponents1);
+ validating = 2;
+ validateComponents(revalidateComponents2);
+ validating = 3;
+ validateComponents(revalidateComponents3);
+ }
+ finally {
+ validating = 0;
+ }
// this needs to be done after all revalidates have finished
// as revalidates can change what component can be focusable
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-11-28 03:04:25
|
Revision: 2809
http://sourceforge.net/p/swingme/code/2809
Author: yuranet
Date: 2024-11-28 03:04:23 +0000 (Thu, 28 Nov 2024)
Log Message:
-----------
fix for at least some more images loading correctly
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2024-11-23 23:22:44 UTC (rev 2808)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2024-11-28 03:04:23 UTC (rev 2809)
@@ -1,11 +1,14 @@
package javax.microedition.lcdui;
import java.io.BufferedInputStream;
+import java.io.FileDescriptor;
+import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import javax.microedition.lcdui.game.Sprite;
import net.yura.android.AndroidMeApp;
+import net.yura.mobile.util.SystemUtil;
import android.content.res.Resources;
import android.graphics.Bitmap;
import android.graphics.Bitmap.Config;
@@ -87,7 +90,7 @@
}
public static Image createImage(InputStream stream) throws IOException {
- Bitmap bitmap;
+ Bitmap bitmap = null;
if (stream instanceof ResourceInputStream) {
try {
bitmap = ((ResourceInputStream) stream).getBitmap();
@@ -103,11 +106,6 @@
}
}
else {
- int available = stream.available();
- int size = Math.max(available, 8 * 1024);
- BufferedInputStream buffInput = new BufferedInputStream(stream, size);
- buffInput.mark(size);
-
BitmapFactory.Options options = new BitmapFactory.Options();
options.inPreferredConfig = Bitmap.Config.ARGB_8888;
options.inDither = false;
@@ -115,26 +113,53 @@
options.inScaled = false;
options.inSampleSize = 1;
+ // on API-35, fran_andalucia_pic.gif image does not open the standard way, android is f-ing nuts
+ // https://maps.yura.net/storage/2012-12-31-15-24-29/fran_andalucia_pic.gif
+ // but it DOES open correctly if we use the path or FileDescriptor to load the image
+ // this ONLY works if we try it first, if we try and read with another method first, this fails also
+ if (stream instanceof FileInputStream) {
+ FileInputStream fIn = (FileInputStream) stream;
+ FileDescriptor fd = fIn.getFD();
+ bitmap = BitmapFactory.decodeFileDescriptor(fd, null, options);
+ }
+
+ int available = 0;
+ BufferedInputStream buffInput = null;
OutOfMemoryError error = null;
- try {
- bitmap = BitmapFactory.decodeStream(buffInput,null,options);
+ if (bitmap == null) {
+ available = stream.available();
+ int size = Math.max(available, 8 * 1024);
+ buffInput = new BufferedInputStream(stream, size);
+ buffInput.mark(size);
- // TODO not sure why this sometimes happens, very random and no error given, the available size is showing the correct value for this file
- // other people have similar error: https://stackoverflow.com/questions/1630258/android-bug-with-threadsafeclientconnmanager-downloading-images
- // loading solar2_pic.png - BitmapFactory.decodeStream returns null java.io.FileInputStream@c6d489b available=1725844 image/png 1056x798
- if (bitmap == null) {
+ try {
+ // decodeStream is the most simple, but least reliable method on android
+ bitmap = BitmapFactory.decodeStream(buffInput, null, options);
+
+ // TODO not sure why this sometimes happens, very random and no error given, the available size is showing the correct value for this file
+ // other people have similar error: https://stackoverflow.com/questions/1630258/android-bug-with-threadsafeclientconnmanager-downloading-images
+ // loading solar2_pic.png - BitmapFactory.decodeStream returns null java.io.FileInputStream@c6d489b available=1725844 image/png 1056x798
+ // decodeByteArray seems to be more reliable, and works correctly in times when decodeStream returns null
+ if (bitmap == null) {
+ buffInput.reset();
+ byte[] allData = SystemUtil.getData(buffInput, -1);
+ bitmap = BitmapFactory.decodeByteArray(allData, 0, allData.length, options);
+
+ // no harm in trying without the options
+ if (bitmap == null) {
+ bitmap = BitmapFactory.decodeByteArray(allData, 0, allData.length);
+ }
+ }
+ }
+ catch (OutOfMemoryError e) {
+ cleanMem();
+ error = e;
buffInput.reset();
- bitmap = BitmapFactory.decodeStream(buffInput);
+ options.inScaled = true; // this prob does nothing
+ options.inSampleSize = 0; // this prob does nothing
+ bitmap = BitmapFactory.decodeStream(buffInput, null, options);
}
}
- catch (OutOfMemoryError e) {
- cleanMem();
- error = e;
- buffInput.reset();
- options.inScaled = true; // this prob does nothing
- options.inSampleSize = 0; // this prob does nothing
- bitmap = BitmapFactory.decodeStream(buffInput,null,options);
- }
if (bitmap == null) {
throw new IOException("BitmapFactory.decodeStream returned null " + stream + " oldAvailable=" + available + " newAvailable=" + buffInput.available() + " " + options.outMimeType + " " + options.outWidth + "x" + options.outHeight + " " + error);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-11-23 23:22:45
|
Revision: 2808
http://sourceforge.net/p/swingme/code/2808
Author: yuranet
Date: 2024-11-23 23:22:44 +0000 (Sat, 23 Nov 2024)
Log Message:
-----------
fix startup error
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/AndroidMeActivity.java
Modified: AndroidME/src_Android/net/yura/android/AndroidMeActivity.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeActivity.java 2024-11-23 20:45:26 UTC (rev 2807)
+++ AndroidME/src_Android/net/yura/android/AndroidMeActivity.java 2024-11-23 23:22:44 UTC (rev 2808)
@@ -41,11 +41,6 @@
// this needs to be static as AndroidMeActivity can close and a new instance can start and we still want to have a WakeLock
private static PowerManager.WakeLock wl;
- public AndroidMeActivity() {
- // can ONLY be done here as shouldShowRequestPermissionRationale ONLY exists in the public API on Activity
- updateNotificationState();
- }
-
/**
* @see net.yura.ios.iOSNotifications#checkNotificationAuthorization()
*/
@@ -73,6 +68,9 @@
final protected void onCreate(Bundle icicle) {
super.onCreate(icicle);
+ // can ONLY be done here as shouldShowRequestPermissionRationale ONLY exists in the public API on Activity
+ updateNotificationState();
+
if (DEFAULT_ACTIVITY != null) {
// This can only run as single instance!!
// Forward the intent that started us, and then die.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-11-23 20:45:28
|
Revision: 2807
http://sourceforge.net/p/swingme/code/2807
Author: yuranet
Date: 2024-11-23 20:45:26 +0000 (Sat, 23 Nov 2024)
Log Message:
-----------
again stupid android has changed notification system
Modified Paths:
--------------
AndroidME/build.gradle
AndroidME/src_Android/net/yura/android/AndroidMeActivity.java
AndroidME/src_Android/net/yura/android/AndroidMeApp.java
AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java
Modified: AndroidME/build.gradle
===================================================================
--- AndroidME/build.gradle 2024-11-21 17:59:59 UTC (rev 2806)
+++ AndroidME/build.gradle 2024-11-23 20:45:26 UTC (rev 2807)
@@ -15,8 +15,9 @@
android {
compileOptions.encoding = 'cp1252'
- compileSdkVersion 28
- buildToolsVersion '28.0.3'
+ // updating to 35 may require a update of the gradle plugin!!
+ compileSdkVersion 34
+ buildToolsVersion '34.0.0'
sourceSets {
main {
Modified: AndroidME/src_Android/net/yura/android/AndroidMeActivity.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeActivity.java 2024-11-21 17:59:59 UTC (rev 2806)
+++ AndroidME/src_Android/net/yura/android/AndroidMeActivity.java 2024-11-23 20:45:26 UTC (rev 2807)
@@ -1,5 +1,6 @@
package net.yura.android;
+import java.util.Arrays;
import java.util.List;
import javax.microedition.lcdui.Canvas;
import javax.microedition.lcdui.Display;
@@ -6,9 +7,12 @@
import javax.microedition.lcdui.Displayable;
import javax.microedition.midlet.MIDlet;
import net.yura.mobile.logging.Logger;
+import android.Manifest;
import android.app.Activity;
+import android.app.NotificationManager;
import android.content.Context;
import android.content.Intent;
+import android.content.pm.PackageManager;
import android.content.res.Configuration;
import android.graphics.PixelFormat;
import android.os.Build;
@@ -37,6 +41,34 @@
// this needs to be static as AndroidMeActivity can close and a new instance can start and we still want to have a WakeLock
private static PowerManager.WakeLock wl;
+ public AndroidMeActivity() {
+ // can ONLY be done here as shouldShowRequestPermissionRationale ONLY exists in the public API on Activity
+ updateNotificationState();
+ }
+
+ /**
+ * @see net.yura.ios.iOSNotifications#checkNotificationAuthorization()
+ */
+ public void updateNotificationState() {
+ try {
+ String NOTIFICATION_AUTHORIZATION_STATUS = "notificationSetting";
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && !getSystemService(NotificationManager.class).areNotificationsEnabled()) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU && shouldShowRequestPermissionRationale(Manifest.permission.POST_NOTIFICATIONS)) {
+ System.setProperty(NOTIFICATION_AUTHORIZATION_STATUS, "ask");
+ }
+ else {
+ System.setProperty(NOTIFICATION_AUTHORIZATION_STATUS, "off");
+ }
+ }
+ else {
+ System.setProperty(NOTIFICATION_AUTHORIZATION_STATUS, "on");
+ }
+ }
+ catch (Throwable th) {
+ Logger.warn("updateNotificationState error", th);
+ }
+ }
+
@Override
final protected void onCreate(Bundle icicle) {
super.onCreate(icicle);
@@ -380,6 +412,21 @@
}
}
+ // Added in API level 23
+ @Override
+ public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) {
+ try {
+ boolean granted = (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED);
+ Logger.info("onRequestPermissionsResult " + requestCode + " " + Arrays.asList(permissions) + " " + granted);
+ // not really much we can do here, so we dont really care
+ // in android docs it says:
+ // Explain to the user that the feature is unavailable because the feature requires a permission that the user has denied.
+ }
+ catch (Throwable th) {
+ Logger.warn("onRequestPermissionsResult error", th);
+ }
+ }
+
private int hardKeyboardHidden;
/**
Modified: AndroidME/src_Android/net/yura/android/AndroidMeApp.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeApp.java 2024-11-21 17:59:59 UTC (rev 2806)
+++ AndroidME/src_Android/net/yura/android/AndroidMeApp.java 2024-11-23 20:45:26 UTC (rev 2807)
@@ -29,6 +29,7 @@
import java.util.Properties;
import java.util.Vector;
import javax.microedition.midlet.MIDlet;
+import net.yura.mobile.BuildConfig;
import net.yura.mobile.logging.Logger;
public class AndroidMeApp extends Application {
@@ -303,7 +304,7 @@
// this should be unique to every account on every device but is not because of bugs in old versions of android
// some old devices all reported the same android id
- System.setProperty("androidId", String.valueOf(android.provider.Settings.Secure.getString(getContext().getContentResolver(), android.provider.Settings.Secure.ANDROID_ID)));
+ System.setProperty("androidId", String.valueOf(Settings.Secure.getString(getContext().getContentResolver(), Settings.Secure.ANDROID_ID)));
setFileSystemProperties();
@@ -319,11 +320,11 @@
ex.printStackTrace();
}
- if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.ECLAIR) {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ECLAIR) {
System.setProperty("installerPackageName", String.valueOf(getPackageManager().getInstallerPackageName(getPackageName())));
}
- System.setProperty("debug", String.valueOf(net.yura.mobile.BuildConfig.DEBUG) );
+ System.setProperty("debug", String.valueOf(BuildConfig.DEBUG) );
// HTTP connection reuse which was buggy pre-froyo
// http://android-developers.blogspot.dk/2011/09/androids-http-clients.html
@@ -352,9 +353,8 @@
// we HAVE to call any static method first to make sure the static initializer in Application sets the default
net.yura.mobile.gui.Application.getPlatform();
- Logger.setLevel(net.yura.mobile.BuildConfig.DEBUG ? Logger.DEBUG : Logger.INFO);
+ Logger.setLevel(BuildConfig.DEBUG ? Logger.DEBUG : Logger.INFO);
-
// Listen for External Storage events
IntentFilter fileFilter = new IntentFilter(Intent.ACTION_MEDIA_MOUNTED);
fileFilter.addAction(Intent.ACTION_MEDIA_UNMOUNTED);
Modified: AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java 2024-11-21 17:59:59 UTC (rev 2806)
+++ AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java 2024-11-23 20:45:26 UTC (rev 2807)
@@ -163,7 +163,7 @@
}
}
else if (url.equals(PROTOCOL_NOTIFY + "//requestAuthorization")) {
- createNotificationChannel();
+ createNotificationChannelAndRequestPermissions();
}
else if (url.startsWith(PROTOCOL_NOTIFY)) {
// there is a bug on android older versions so we use our Url to decode.
@@ -386,7 +386,7 @@
/**
* This triggers a popup that asks the user if they want to enable notifications
*/
- private void createNotificationChannel() {
+ private void createNotificationChannelAndRequestPermissions() {
try {
// Create the NotificationChannel, but only on API 26+ because
// the NotificationChannel class is new and not in the support library
@@ -405,6 +405,21 @@
catch (Throwable th) {
Logger.warn("failed to create NotificationChannel: " + CHANNEL_ID, th);
}
+
+ try {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+ NotificationManager notificationManager = AndroidMeApp.getContext().getSystemService(NotificationManager.class);
+ if (!notificationManager.areNotificationsEnabled()) {
+ AndroidMeActivity.DEFAULT_ACTIVITY.requestPermissions(
+ new String[] { Manifest.permission.POST_NOTIFICATIONS },
+ 123 // random number, as we dont care about result
+ );
+ }
+ }
+ }
+ catch (Throwable th) {
+ Logger.warn("failed to enable Notifications: " + CHANNEL_ID, th);
+ }
}
private void showNotification(String title,String num,String message,String icon,String onlyBackground, Map<String, ? extends Object> options) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-11-21 18:00:04
|
Revision: 2806
http://sourceforge.net/p/swingme/code/2806
Author: yuranet
Date: 2024-11-21 17:59:59 +0000 (Thu, 21 Nov 2024)
Log Message:
-----------
avoid error in UI
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/components/TextArea.java
Modified: SwingME/src/net/yura/mobile/gui/components/TextArea.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/TextArea.java 2024-11-21 16:38:01 UTC (rev 2805)
+++ SwingME/src/net/yura/mobile/gui/components/TextArea.java 2024-11-21 17:59:59 UTC (rev 2806)
@@ -406,15 +406,14 @@
doNotUpdateCaretPixelOffset = false;
}
scrollRectToVisible(xoffset, line * lineHeight, lineHeight, lineHeight, false);
-
}
-
protected void workoutMinimumSize() {
if (wrap) {
- if (getPreferredWidth()!=-1) {
- // this method can be used to determin the size of a dialog suring a pack
- // so here we need to give a reasonale responce
+ // negative sizes cause getLines to throw StringIndexOutOfBoundsException
+ if (getPreferredWidth() > -1) {
+ // this method can be used to determine the size of a dialog during a pack
+ // so here we need to give a reasonable response
width = getPreferredWidth();
if (width != widthUsed) {
lines = getLines(getText(),font,0,width);
@@ -440,7 +439,6 @@
width = getMinWidth();
height = getMinHeight();
}
-
}
public void setSize(int wi,int h) {
@@ -451,7 +449,6 @@
}
}
-
private void setupHeight(int[] ln) {
int oldh = height;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-11-21 16:38:03
|
Revision: 2805
http://sourceforge.net/p/swingme/code/2805
Author: yuranet
Date: 2024-11-21 16:38:01 +0000 (Thu, 21 Nov 2024)
Log Message:
-----------
android fallbacks
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/AndroidMeApp.java
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java
Modified: AndroidME/src_Android/net/yura/android/AndroidMeApp.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeApp.java 2024-11-10 16:58:24 UTC (rev 2804)
+++ AndroidME/src_Android/net/yura/android/AndroidMeApp.java 2024-11-21 16:38:01 UTC (rev 2805)
@@ -101,6 +101,12 @@
try {
setSystemProperties();
+ }
+ catch (Throwable e) {
+ Logger.warn("error in setSystemProperties", e);
+ }
+
+ try {
loadJadFile();
List<String[]> jadMidlets = getJadMidlets();
@@ -299,27 +305,6 @@
// some old devices all reported the same android id
System.setProperty("androidId", String.valueOf(android.provider.Settings.Secure.getString(getContext().getContentResolver(), android.provider.Settings.Secure.ANDROID_ID)));
-
- // Listen for External Storage events
- IntentFilter fileFilter = new IntentFilter(Intent.ACTION_MEDIA_MOUNTED);
- fileFilter.addAction(Intent.ACTION_MEDIA_UNMOUNTED);
- fileFilter.addAction(Intent.ACTION_MEDIA_SCANNER_STARTED);
- fileFilter.addAction(Intent.ACTION_MEDIA_SCANNER_FINISHED);
- fileFilter.addAction(Intent.ACTION_MEDIA_CHECKING);
- fileFilter.addAction(Intent.ACTION_MEDIA_EJECT);
- fileFilter.addDataScheme("file");
-
- BroadcastReceiver receiver = new SystemChangedBroadcastReceiver();
- registerReceiver(receiver, fileFilter);
-
- if ( hasPermission("ACCESS_WIFI_STATE") ) {
-
- IntentFilter wifiFilter = new IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION);
- wifiFilter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION);
-
- registerReceiver(receiver, wifiFilter);
- }
-
setFileSystemProperties();
// BlueTooth
@@ -340,7 +325,6 @@
System.setProperty("debug", String.valueOf(net.yura.mobile.BuildConfig.DEBUG) );
-
// HTTP connection reuse which was buggy pre-froyo
// http://android-developers.blogspot.dk/2011/09/androids-http-clients.html
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB ) {
@@ -369,6 +353,27 @@
// we HAVE to call any static method first to make sure the static initializer in Application sets the default
net.yura.mobile.gui.Application.getPlatform();
Logger.setLevel(net.yura.mobile.BuildConfig.DEBUG ? Logger.DEBUG : Logger.INFO);
+
+
+ // Listen for External Storage events
+ IntentFilter fileFilter = new IntentFilter(Intent.ACTION_MEDIA_MOUNTED);
+ fileFilter.addAction(Intent.ACTION_MEDIA_UNMOUNTED);
+ fileFilter.addAction(Intent.ACTION_MEDIA_SCANNER_STARTED);
+ fileFilter.addAction(Intent.ACTION_MEDIA_SCANNER_FINISHED);
+ fileFilter.addAction(Intent.ACTION_MEDIA_CHECKING);
+ fileFilter.addAction(Intent.ACTION_MEDIA_EJECT);
+ fileFilter.addDataScheme("file");
+
+ BroadcastReceiver receiver = new SystemChangedBroadcastReceiver();
+ registerReceiver(receiver, fileFilter);
+
+ if ( hasPermission("ACCESS_WIFI_STATE") ) {
+
+ IntentFilter wifiFilter = new IntentFilter(WifiManager.WIFI_STATE_CHANGED_ACTION);
+ wifiFilter.addAction(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION);
+
+ registerReceiver(receiver, wifiFilter);
+ }
}
private boolean hasPermission(String permission) {
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2024-11-10 16:58:24 UTC (rev 2804)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2024-11-21 16:38:01 UTC (rev 2805)
@@ -106,6 +106,7 @@
int available = stream.available();
int size = Math.max(available, 8 * 1024);
BufferedInputStream buffInput = new BufferedInputStream(stream, size);
+ buffInput.mark(size);
BitmapFactory.Options options = new BitmapFactory.Options();
options.inPreferredConfig = Bitmap.Config.ARGB_8888;
@@ -122,6 +123,7 @@
// other people have similar error: https://stackoverflow.com/questions/1630258/android-bug-with-threadsafeclientconnmanager-downloading-images
// loading solar2_pic.png - BitmapFactory.decodeStream returns null java.io.FileInputStream@c6d489b available=1725844 image/png 1056x798
if (bitmap == null) {
+ buffInput.reset();
bitmap = BitmapFactory.decodeStream(buffInput);
}
}
@@ -129,7 +131,6 @@
cleanMem();
error = e;
buffInput.reset();
- buffInput.mark(1024);
options.inScaled = true; // this prob does nothing
options.inSampleSize = 0; // this prob does nothing
bitmap = BitmapFactory.decodeStream(buffInput,null,options);
Modified: AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java 2024-11-10 16:58:24 UTC (rev 2804)
+++ AndroidME/src_MIDP/javax/microedition/midlet/MIDlet.java 2024-11-21 16:38:01 UTC (rev 2805)
@@ -2,6 +2,7 @@
import java.io.File;
import java.lang.reflect.Method;
+import java.util.List;
import java.util.Map;
import java.util.Properties;
import javax.microedition.io.ConnectionNotFoundException;
@@ -21,6 +22,7 @@
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
import android.net.MailTo;
import android.net.Uri;
import android.os.Build;
@@ -316,7 +318,18 @@
else {
String action = url.startsWith(PROTOCOL_PHONE) ? Intent.ACTION_DIAL : (url.startsWith("mailto:") ? Intent.ACTION_SENDTO : Intent.ACTION_DEFAULT);
Intent intent = new Intent(action, content);
- activity.startActivity(intent);
+ try {
+ activity.startActivity(intent);
+ }
+ catch (Exception ex) {
+ // sometimes normal URLs just dont open on android for android crazy reasons
+ if (url.startsWith(PROTOCOL_HTTP) || url.startsWith(PROTOCOL_HTTPS)) {
+ backupOpenURL(activity, content);
+ }
+ else {
+ throw ex;
+ }
+ }
}
}
catch (Throwable e) {
@@ -332,6 +345,26 @@
return false;
}
+ private static void backupOpenURL(Context mContext, Uri uri) {
+ // This is also how the Android framework itself detects browsers.
+ // https://cs.android.com/android/platform/superproject/+/master:packages/modules/Permission/PermissionController/src/com/android/permissioncontroller/role/model/BrowserRoleBehavior.java;l=47-50?q=BrowserRoleBehavior&ss=android%2Fplatform%2Fsuperproject
+ Intent browserIntent = new Intent()
+ .setAction(Intent.ACTION_VIEW)
+ .addCategory(Intent.CATEGORY_BROWSABLE)
+ .setData(Uri.fromParts("http", "", null));
+
+ List<ResolveInfo> possibleBrowsers = mContext.getPackageManager().queryIntentActivities(browserIntent, PackageManager.MATCH_DEFAULT_ONLY);
+ if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M && possibleBrowsers.isEmpty()) {
+ possibleBrowsers = mContext.getPackageManager().queryIntentActivities(browserIntent, PackageManager.MATCH_ALL);
+ }
+
+ Intent openUrlIntent = new Intent(Intent.ACTION_VIEW, uri);
+ if (!possibleBrowsers.isEmpty()) {
+ openUrlIntent.setPackage(possibleBrowsers.get(0).activityInfo.packageName);
+ }
+ mContext.startActivity(openUrlIntent);
+ }
+
private boolean containsQueryParameter(String urlString, String param) {
Url url = new Url(urlString);
return !"".equals(url.getQueryParameter(param));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-11-10 16:58:36
|
Revision: 2804
http://sourceforge.net/p/swingme/code/2804
Author: yuranet
Date: 2024-11-10 16:58:24 +0000 (Sun, 10 Nov 2024)
Log Message:
-----------
logging fix
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/AndroidMeApp.java
Modified: AndroidME/src_Android/net/yura/android/AndroidMeApp.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeApp.java 2024-11-10 16:41:07 UTC (rev 2803)
+++ AndroidME/src_Android/net/yura/android/AndroidMeApp.java 2024-11-10 16:58:24 UTC (rev 2804)
@@ -135,7 +135,7 @@
} catch (Throwable e) {
// Don't care
//#debug debug
- Logger.warn(null, e);
+ Logger.warn("unable to unregisterReceiver: " + receiver, e);
}
}
broadcastReceiverList.removeAllElements();
@@ -388,7 +388,7 @@
}
catch (Throwable e) {
//#debug debug
- System.out.println(e.getStackTrace());
+ System.out.println("getUniqueHardwareId fail1: " + e);
}
try {
@@ -403,7 +403,7 @@
}
catch (Throwable e) {
//#debug debug
- System.out.println(e.getStackTrace());
+ System.out.println("getUniqueHardwareId fail2: " + e);
}
try {
@@ -422,7 +422,7 @@
}
catch (Throwable e) {
//#debug debug
- System.out.println(e.getStackTrace());
+ System.out.println("getUniqueHardwareId fail3: " + e);
}
//#debug debug
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-11-10 16:41:08
|
Revision: 2803
http://sourceforge.net/p/swingme/code/2803
Author: yuranet
Date: 2024-11-10 16:41:07 +0000 (Sun, 10 Nov 2024)
Log Message:
-----------
do not crash on unable to registerReceiver on api level 34
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/AndroidMeApp.java
Modified: AndroidME/src_Android/net/yura/android/AndroidMeApp.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeApp.java 2024-10-14 23:09:13 UTC (rev 2802)
+++ AndroidME/src_Android/net/yura/android/AndroidMeApp.java 2024-11-10 16:41:07 UTC (rev 2803)
@@ -84,6 +84,11 @@
instance = this;
handler = new Handler();
+ //androidx.lifecycle.ProcessLifecycleOwner.get().getLifecycle().addObserver(new androidx.lifecycle.DefaultLifecycleObserver() {
+ // public void onPause(androidx.lifecycle.LifecycleOwner owner) {
+ // System.out.println("############# AndroidMeApp.onPause");
+ // }
+ //});
}
@Override
@@ -148,9 +153,17 @@
@Override
public Intent registerReceiver(BroadcastReceiver receiver, IntentFilter filter) {
- broadcastReceiverList.add(receiver); // Keep a copy, so we can clean up on shutdown.
-
- return super.registerReceiver(receiver, filter);
+ try {
+ Intent result = super.registerReceiver(receiver, filter);
+ broadcastReceiverList.add(receiver); // Keep a copy, so we can clean up on shutdown.
+ return result;
+ }
+ catch (Throwable th) {
+ // may throw error, e.g:
+ // java.lang.SecurityException: net.yura.domination: One of RECEIVER_EXPORTED or RECEIVER_NOT_EXPORTED should be specified when a receiver isn't being registered exclusively for system broadcasts
+ Logger.warn("unable to registerReceiver: " + receiver, th);
+ return null;
+ }
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-10-14 23:09:15
|
Revision: 2802
http://sourceforge.net/p/swingme/code/2802
Author: yuranet
Date: 2024-10-14 23:09:13 +0000 (Mon, 14 Oct 2024)
Log Message:
-----------
slightly less code
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/io/StorageAccessConnection.java
Modified: AndroidME/src_Android/net/yura/android/io/StorageAccessConnection.java
===================================================================
--- AndroidME/src_Android/net/yura/android/io/StorageAccessConnection.java 2024-10-14 20:49:25 UTC (rev 2801)
+++ AndroidME/src_Android/net/yura/android/io/StorageAccessConnection.java 2024-10-14 23:09:13 UTC (rev 2802)
@@ -56,8 +56,9 @@
// file in dir = content://com.android.externalstorage.documents/tree/primary%3ADomination%20Maps/document/primary%3ADomination%20Maps%2Fpreview%2Fgodstorm.jpg
Uri androidDocumentUri = Uri.parse(uri);
+
List<String> pathSegments = androidDocumentUri.getPathSegments();
- int paths = 0;
+ int paths = pathSegments.size();
while (!DocumentsContract.isDocumentUri(AndroidMeApp.getContext(), androidDocumentUri)) {
String androidUri = androidDocumentUri.toString();
int lastSlash = androidUri.lastIndexOf('/');
@@ -65,13 +66,12 @@
throw new IllegalArgumentException("unable to make doc uri: " + uri);
}
androidDocumentUri = Uri.parse(androidUri.substring(0, lastSlash));
- paths++;
+ paths--;
}
- List<String> segments = pathSegments.subList(pathSegments.size() - paths, pathSegments.size());
- while (!segments.isEmpty()) {
- String fileName = segments.get(0);
- segments = pathSegments.subList(pathSegments.size() - segments.size() + 1, pathSegments.size());
+ while (paths != pathSegments.size()) {
+ String fileName = pathSegments.get(paths);
+ paths++;
// there seems to be no better way to get the Uri for a specific file by name then iterate over all children
// android really have created the worst API in the whole world for accessing files, what retards
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-10-14 20:49:27
|
Revision: 2801
http://sourceforge.net/p/swingme/code/2801
Author: yuranet
Date: 2024-10-14 20:49:25 +0000 (Mon, 14 Oct 2024)
Log Message:
-----------
supports all paths now
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/io/StorageAccessConnection.java
Modified: AndroidME/src_Android/net/yura/android/io/StorageAccessConnection.java
===================================================================
--- AndroidME/src_Android/net/yura/android/io/StorageAccessConnection.java 2024-10-13 09:02:51 UTC (rev 2800)
+++ AndroidME/src_Android/net/yura/android/io/StorageAccessConnection.java 2024-10-14 20:49:25 UTC (rev 2801)
@@ -13,6 +13,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.util.Enumeration;
+import java.util.List;
import java.util.Vector;
import javax.microedition.io.file.FileConnection;
@@ -46,45 +47,63 @@
* @see androidx.documentfile.provider.DocumentFile#findFile(String)
*/
private Uri getAndroidDocumentUri() {
- if (documentUri != null) {
- return documentUri;
- }
- // TODO what if we are not at the top level? and this is a subfolder????
- if (uri.endsWith("/")) {
- documentUri = Uri.parse(uri);
- return documentUri;
+ // some examples of what this method generates:
+ // treeUri = content://com.android.externalstorage.documents/tree/primary%3ADomination%20Maps
+ // documentUri = content://com.android.externalstorage.documents/tree/primary%3ADomination%20Maps/document/primary%3ADomination%20Maps
+ // childrenUri = content://com.android.externalstorage.documents/tree/primary%3ADomination%20Maps/document/primary%3ADomination%20Maps/children
+ // file space = content://com.android.externalstorage.documents/tree/primary%3ADomination%20Maps/document/primary%3ADomination%20Maps%2FLima%20v1.map
+ // file in dir = content://com.android.externalstorage.documents/tree/primary%3ADomination%20Maps/document/primary%3ADomination%20Maps%2Fpreview%2Fgodstorm.jpg
+
+ Uri androidDocumentUri = Uri.parse(uri);
+ List<String> pathSegments = androidDocumentUri.getPathSegments();
+ int paths = 0;
+ while (!DocumentsContract.isDocumentUri(AndroidMeApp.getContext(), androidDocumentUri)) {
+ String androidUri = androidDocumentUri.toString();
+ int lastSlash = androidUri.lastIndexOf('/');
+ if (lastSlash < 0) {
+ throw new IllegalArgumentException("unable to make doc uri: " + uri);
+ }
+ androidDocumentUri = Uri.parse(androidUri.substring(0, lastSlash));
+ paths++;
}
- // there seems to be no better way to get the Uri for a specific file by name then iterate over all children
- // android really have created the worst API in the whole world for accessing files, what retards
+ List<String> segments = pathSegments.subList(pathSegments.size() - paths, pathSegments.size());
+ while (!segments.isEmpty()) {
+ String fileName = segments.get(0);
+ segments = pathSegments.subList(pathSegments.size() - segments.size() + 1, pathSegments.size());
- int lastSlash = uri.lastIndexOf('/') + 1;
- String dir = uri.substring(0, lastSlash);
- String fileName = uri.substring(lastSlash);
+ // there seems to be no better way to get the Uri for a specific file by name then iterate over all children
+ // android really have created the worst API in the whole world for accessing files, what retards
+ Uri childrenDocumentsUri = DocumentsContract.buildChildDocumentsUriUsingTree(androidDocumentUri, DocumentsContract.getDocumentId(androidDocumentUri));
- Uri parentDocumentUri = Uri.parse(dir);
- Uri childDocumentsUri = DocumentsContract.buildChildDocumentsUriUsingTree(parentDocumentUri, DocumentsContract.getDocumentId(parentDocumentUri));
-
- ContentResolver resolver = AndroidMeApp.getIntance().getContentResolver();
- Cursor c = null;
- try {
- c = resolver.query(childDocumentsUri, new String[]{DocumentsContract.Document.COLUMN_DISPLAY_NAME, DocumentsContract.Document.COLUMN_DOCUMENT_ID}, null, null, null);
- while (c.moveToNext()) {
- String displayName = c.getString(0);
- if (fileName.equals(displayName)) {
- String documentId = c.getString(1);
- documentUri = DocumentsContract.buildDocumentUriUsingTree(parentDocumentUri, documentId);
- return documentUri;
+ ContentResolver resolver = AndroidMeApp.getIntance().getContentResolver();
+ Cursor c = null;
+ try {
+ c = resolver.query(childrenDocumentsUri, new String[]{DocumentsContract.Document.COLUMN_DISPLAY_NAME, DocumentsContract.Document.COLUMN_DOCUMENT_ID}, null, null, null);
+ Uri childDocumentUri = null;
+ while (c.moveToNext()) {
+ String displayName = c.getString(0);
+ if (fileName.equals(displayName)) {
+ String documentId = c.getString(1);
+ childDocumentUri = DocumentsContract.buildDocumentUriUsingTree(androidDocumentUri, documentId);
+ break;
+ }
}
+ if (childDocumentUri == null) {
+ // oh shit, we were unable to convert this url into and android one, this file must not exist
+ return null;
+ }
+ else {
+ androidDocumentUri = childDocumentUri;
+ }
}
+ finally {
+ close(c);
+ }
}
- finally {
- close(c);
- }
- // oh shit, we were unable to convert this url into and android one, this file must not exist
- return null;
+ return androidDocumentUri;
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-10-13 09:02:53
|
Revision: 2800
http://sourceforge.net/p/swingme/code/2800
Author: yuranet
Date: 2024-10-13 09:02:51 +0000 (Sun, 13 Oct 2024)
Log Message:
-----------
support lastModified
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/io/StorageAccessConnection.java
Modified: AndroidME/src_Android/net/yura/android/io/StorageAccessConnection.java
===================================================================
--- AndroidME/src_Android/net/yura/android/io/StorageAccessConnection.java 2024-10-13 01:06:41 UTC (rev 2799)
+++ AndroidME/src_Android/net/yura/android/io/StorageAccessConnection.java 2024-10-13 09:02:51 UTC (rev 2800)
@@ -23,7 +23,7 @@
public class StorageAccessConnection implements FileConnection {
private String uri;
- private transient Uri documentUri;
+ private Uri documentUri;
public StorageAccessConnection(String uri) {
setFileConnection(uri);
@@ -32,6 +32,7 @@
@Override
public void setFileConnection(String fileName) {
uri = fileName;
+ documentUri = getAndroidDocumentUri();
}
@Override
@@ -88,9 +89,8 @@
@Override
public String getName() {
- Uri uri = getAndroidDocumentUri();
- if (uri != null) {
- Cursor cursor = AndroidMeApp.getIntance().getContentResolver().query(uri, null, null, null, null, null);
+ if (documentUri != null) {
+ Cursor cursor = AndroidMeApp.getIntance().getContentResolver().query(documentUri, null, null, null, null, null);
try {
if (cursor != null && cursor.moveToFirst()) {
int nameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
@@ -102,14 +102,13 @@
}
}
// fall back to taking the last segment from the url
- return this.uri.substring(this.uri.lastIndexOf('/') + 1);
+ return uri.substring(uri.lastIndexOf('/') + 1);
}
@Override
public long fileSize() throws IOException {
- Uri uri = getAndroidDocumentUri();
- if (uri != null) {
- Cursor cursor = AndroidMeApp.getIntance().getContentResolver().query(uri, null, null, null, null, null);
+ if (documentUri != null) {
+ Cursor cursor = AndroidMeApp.getIntance().getContentResolver().query(documentUri, null, null, null, null, null);
try {
if (cursor != null && cursor.moveToFirst()) {
int sizeIndex = cursor.getColumnIndex(OpenableColumns.SIZE);
@@ -128,8 +127,7 @@
*/
@Override
public boolean exists() {
- Uri uri = getAndroidDocumentUri();
- return uri != null;
+ return documentUri != null;
}
/**
@@ -144,12 +142,11 @@
* @see androidx.documentfile.provider.DocumentsContractApi19#queryForString(Context, Uri, String, String)
*/
private String getMimeType() {
- Uri self = getAndroidDocumentUri();
- if (self != null) {
- final ContentResolver resolver = AndroidMeApp.getIntance().getContentResolver();
+ if (documentUri != null) {
+ ContentResolver resolver = AndroidMeApp.getIntance().getContentResolver();
Cursor c = null;
try {
- c = resolver.query(self, new String[]{DocumentsContract.Document.COLUMN_MIME_TYPE}, null, null, null);
+ c = resolver.query(documentUri, new String[]{DocumentsContract.Document.COLUMN_MIME_TYPE}, null, null, null);
if (c.moveToFirst() && !c.isNull(0)) {
String mimeType = c.getString(0);
return mimeType;
@@ -163,6 +160,26 @@
}
/**
+ * @see androidx.documentfile.provider.DocumentsContractApi19#queryForLong(Context, Uri, String, long)
+ */
+ @Override
+ public long lastModified() {
+ if (documentUri != null) {
+ final ContentResolver resolver = AndroidMeApp.getIntance().getContentResolver();
+ Cursor c = null;
+ try {
+ c = resolver.query(documentUri, new String[]{DocumentsContract.Document.COLUMN_LAST_MODIFIED}, null, null, null);
+ if (c.moveToFirst() && !c.isNull(0)) {
+ return c.getLong(0);
+ }
+ } finally {
+ close(c);
+ }
+ }
+ return 0L;
+ }
+
+ /**
* @see androidx.documentfile.provider.DocumentsContractApi19#closeQuietly(AutoCloseable)
*/
private static void close(Cursor cursor) {
@@ -184,10 +201,9 @@
@Override
public Enumeration list(String filter, boolean includeHidden) throws IOException {
// TODO support filter and hidden files
- Uri parentDocumentUri = getAndroidDocumentUri();
- if (parentDocumentUri == null) { return EMPTY_VECTOR.elements(); }
+ if (documentUri == null) { return EMPTY_VECTOR.elements(); }
- Uri childDocumentsUri = DocumentsContract.buildChildDocumentsUriUsingTree(parentDocumentUri, DocumentsContract.getDocumentId(parentDocumentUri));
+ Uri childDocumentsUri = DocumentsContract.buildChildDocumentsUriUsingTree(documentUri, DocumentsContract.getDocumentId(documentUri));
ContentResolver contentResolver = AndroidMeApp.getIntance().getContentResolver();
Cursor c = contentResolver.query(childDocumentsUri, new String[]{DocumentsContract.Document.COLUMN_DOCUMENT_ID, DocumentsContract.Document.COLUMN_DISPLAY_NAME, DocumentsContract.Document.COLUMN_MIME_TYPE}, null, null, null);
return new CursorEnumeration(c);
@@ -235,12 +251,12 @@
@Override
public InputStream openInputStream() throws IOException {
- return AndroidMeApp.getIntance().getContentResolver().openInputStream(getAndroidDocumentUri());
+ return AndroidMeApp.getIntance().getContentResolver().openInputStream(documentUri);
}
@Override
public OutputStream openOutputStream() throws IOException {
- return AndroidMeApp.getIntance().getContentResolver().openOutputStream(getAndroidDocumentUri());
+ return AndroidMeApp.getIntance().getContentResolver().openOutputStream(documentUri);
}
@@ -261,6 +277,7 @@
@Override
public boolean isHidden() {
+ // COLUMN_FLAGS
throw new UnsupportedOperationException();
}
@@ -270,11 +287,6 @@
}
@Override
- public long lastModified() {
- throw new UnsupportedOperationException();
- }
-
- @Override
public long availableSize() {
throw new UnsupportedOperationException();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-10-13 01:06:44
|
Revision: 2799
http://sourceforge.net/p/swingme/code/2799
Author: yuranet
Date: 2024-10-13 01:06:41 +0000 (Sun, 13 Oct 2024)
Log Message:
-----------
isDirectory added
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/io/StorageAccessConnection.java
Modified: AndroidME/src_Android/net/yura/android/io/StorageAccessConnection.java
===================================================================
--- AndroidME/src_Android/net/yura/android/io/StorageAccessConnection.java 2024-10-13 00:44:28 UTC (rev 2798)
+++ AndroidME/src_Android/net/yura/android/io/StorageAccessConnection.java 2024-10-13 01:06:41 UTC (rev 2799)
@@ -1,6 +1,7 @@
package net.yura.android.io;
import android.content.ContentResolver;
+import android.content.Context;
import android.database.Cursor;
import android.net.Uri;
import android.provider.DocumentsContract;
@@ -122,6 +123,9 @@
return -1;
}
+ /**
+ * @see androidx.documentfile.provider.DocumentsContractApi19#exists(Context, Uri)
+ */
@Override
public boolean exists() {
Uri uri = getAndroidDocumentUri();
@@ -128,6 +132,17 @@
return uri != null;
}
+ /**
+ * @see androidx.documentfile.provider.DocumentsContractApi19#isDirectory(Context, Uri)
+ */
+ @Override
+ public boolean isDirectory() {
+ return DocumentsContract.Document.MIME_TYPE_DIR.equals(getMimeType());
+ }
+
+ /**
+ * @see androidx.documentfile.provider.DocumentsContractApi19#queryForString(Context, Uri, String, String)
+ */
private String getMimeType() {
Uri self = getAndroidDocumentUri();
if (self != null) {
@@ -147,6 +162,9 @@
return null;
}
+ /**
+ * @see androidx.documentfile.provider.DocumentsContractApi19#closeQuietly(AutoCloseable)
+ */
private static void close(Cursor cursor) {
if (cursor != null) {
cursor.close();
@@ -242,11 +260,6 @@
}
@Override
- public boolean isDirectory() {
- throw new UnsupportedOperationException();
- }
-
- @Override
public boolean isHidden() {
throw new UnsupportedOperationException();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-10-13 00:44:30
|
Revision: 2798
http://sourceforge.net/p/swingme/code/2798
Author: yuranet
Date: 2024-10-13 00:44:28 +0000 (Sun, 13 Oct 2024)
Log Message:
-----------
less fragile url to file conversion
Modified Paths:
--------------
SwingME/src_se/net/yura/midp/io/JavaFileConnection.java
Modified: SwingME/src_se/net/yura/midp/io/JavaFileConnection.java
===================================================================
--- SwingME/src_se/net/yura/midp/io/JavaFileConnection.java 2024-10-13 00:26:29 UTC (rev 2797)
+++ SwingME/src_se/net/yura/midp/io/JavaFileConnection.java 2024-10-13 00:44:28 UTC (rev 2798)
@@ -9,6 +9,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.net.URI;
import java.util.Enumeration;
import java.util.Vector;
import java.util.regex.Pattern;
@@ -47,13 +48,25 @@
}
private static final File getFile(String url) throws IOException {
- final String URL_FILE_ROOT = "file:///";
- if (url == null || !url.startsWith(URL_FILE_ROOT)) {
- throw new IOException("Invalid file url");
+ try {
+ // on android this accepts:
+ // - file:/storage/... (the output of the File.toURI() method)
+ // - file:///storage/...
+ // - file:////storage/...
+ // and so on, but NOT 'file://storage/...'
+ // also this method HATES spaces, so we must replace them
+ return new File(new URI(url.replaceAll(" ", "%20")));
}
+ catch (Throwable th) {
+ // fallback to old j2me style method
+ final String URL_FILE_ROOT = "file:///";
+ if (url == null || !url.startsWith(URL_FILE_ROOT)) {
+ throw new IOException("Invalid file url: " + url);
+ }
- String filePath = url.substring(URL_FILE_ROOT.length());
- return new File(filePath);
+ String filePath = url.substring(URL_FILE_ROOT.length());
+ return new File(filePath);
+ }
}
private File file;
@@ -140,6 +153,10 @@
return this.file.getPath();
}
+ /**
+ * WARNING! this outputs in the format file:/storage/...
+ * Not quite the same as J2ME, but so long as we can also load that format, its ok.
+ */
// Override
public String getURL() {
return this.file.toURI().toString();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-10-13 00:26:30
|
Revision: 2797
http://sourceforge.net/p/swingme/code/2797
Author: yuranet
Date: 2024-10-13 00:26:29 +0000 (Sun, 13 Oct 2024)
Log Message:
-----------
Connector for Android Storage Access
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/io/Connector.java
Added Paths:
-----------
AndroidME/src_Android/net/yura/android/io/StorageAccessConnection.java
Added: AndroidME/src_Android/net/yura/android/io/StorageAccessConnection.java
===================================================================
--- AndroidME/src_Android/net/yura/android/io/StorageAccessConnection.java (rev 0)
+++ AndroidME/src_Android/net/yura/android/io/StorageAccessConnection.java 2024-10-13 00:26:29 UTC (rev 2797)
@@ -0,0 +1,338 @@
+package net.yura.android.io;
+
+import android.content.ContentResolver;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.DocumentsContract;
+import android.provider.OpenableColumns;
+import net.yura.android.AndroidMeApp;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.Enumeration;
+import java.util.Vector;
+import javax.microedition.io.file.FileConnection;
+
+/**
+ * Android Storage Access Framework, (the worst pile of shit in the world)
+ * more info: https://github.com/K1rakishou/Fuck-Storage-Access-Framework
+ */
+public class StorageAccessConnection implements FileConnection {
+
+ private String uri;
+ private transient Uri documentUri;
+
+ public StorageAccessConnection(String uri) {
+ setFileConnection(uri);
+ }
+
+ @Override
+ public void setFileConnection(String fileName) {
+ uri = fileName;
+ }
+
+ @Override
+ public String getURL() {
+ return uri;
+ }
+
+ /**
+ * This url was created by the app, the app does not know about how on crack android api urls are
+ * so this url is created using the simple way of add the filename to the end of a url.
+ * @see androidx.documentfile.provider.DocumentFile#findFile(String)
+ */
+ private Uri getAndroidDocumentUri() {
+ if (documentUri != null) {
+ return documentUri;
+ }
+
+ // TODO what if we are not at the top level? and this is a subfolder????
+ if (uri.endsWith("/")) {
+ documentUri = Uri.parse(uri);
+ return documentUri;
+ }
+
+ // there seems to be no better way to get the Uri for a specific file by name then iterate over all children
+ // android really have created the worst API in the whole world for accessing files, what retards
+
+ int lastSlash = uri.lastIndexOf('/') + 1;
+ String dir = uri.substring(0, lastSlash);
+ String fileName = uri.substring(lastSlash);
+
+ Uri parentDocumentUri = Uri.parse(dir);
+ Uri childDocumentsUri = DocumentsContract.buildChildDocumentsUriUsingTree(parentDocumentUri, DocumentsContract.getDocumentId(parentDocumentUri));
+
+ ContentResolver resolver = AndroidMeApp.getIntance().getContentResolver();
+ Cursor c = null;
+ try {
+ c = resolver.query(childDocumentsUri, new String[]{DocumentsContract.Document.COLUMN_DISPLAY_NAME, DocumentsContract.Document.COLUMN_DOCUMENT_ID}, null, null, null);
+ while (c.moveToNext()) {
+ String displayName = c.getString(0);
+ if (fileName.equals(displayName)) {
+ String documentId = c.getString(1);
+ documentUri = DocumentsContract.buildDocumentUriUsingTree(parentDocumentUri, documentId);
+ return documentUri;
+ }
+ }
+ }
+ finally {
+ close(c);
+ }
+
+ // oh shit, we were unable to convert this url into and android one, this file must not exist
+ return null;
+ }
+
+ @Override
+ public String getName() {
+ Uri uri = getAndroidDocumentUri();
+ if (uri != null) {
+ Cursor cursor = AndroidMeApp.getIntance().getContentResolver().query(uri, null, null, null, null, null);
+ try {
+ if (cursor != null && cursor.moveToFirst()) {
+ int nameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME);
+ return cursor.getString(nameIndex);
+ }
+ }
+ finally {
+ close(cursor);
+ }
+ }
+ // fall back to taking the last segment from the url
+ return this.uri.substring(this.uri.lastIndexOf('/') + 1);
+ }
+
+ @Override
+ public long fileSize() throws IOException {
+ Uri uri = getAndroidDocumentUri();
+ if (uri != null) {
+ Cursor cursor = AndroidMeApp.getIntance().getContentResolver().query(uri, null, null, null, null, null);
+ try {
+ if (cursor != null && cursor.moveToFirst()) {
+ int sizeIndex = cursor.getColumnIndex(OpenableColumns.SIZE);
+ return cursor.isNull(sizeIndex) ? -1 : cursor.getInt(sizeIndex);
+ }
+ }
+ finally {
+ close(cursor);
+ }
+ }
+ return -1;
+ }
+
+ @Override
+ public boolean exists() {
+ Uri uri = getAndroidDocumentUri();
+ return uri != null;
+ }
+
+ private String getMimeType() {
+ Uri self = getAndroidDocumentUri();
+ if (self != null) {
+ final ContentResolver resolver = AndroidMeApp.getIntance().getContentResolver();
+ Cursor c = null;
+ try {
+ c = resolver.query(self, new String[]{DocumentsContract.Document.COLUMN_MIME_TYPE}, null, null, null);
+ if (c.moveToFirst() && !c.isNull(0)) {
+ String mimeType = c.getString(0);
+ return mimeType;
+ }
+ }
+ finally {
+ close(c);
+ }
+ }
+ return null;
+ }
+
+ private static void close(Cursor cursor) {
+ if (cursor != null) {
+ cursor.close();
+ }
+ }
+
+ @Override
+ public Enumeration list() throws IOException {
+ return list(null, false);
+ }
+
+ private static final Vector EMPTY_VECTOR = new Vector(0);
+
+ /**
+ * @see androidx.documentfile.provider.TreeDocumentFile#listFiles()
+ */
+ @Override
+ public Enumeration list(String filter, boolean includeHidden) throws IOException {
+ // TODO support filter and hidden files
+ Uri parentDocumentUri = getAndroidDocumentUri();
+ if (parentDocumentUri == null) { return EMPTY_VECTOR.elements(); }
+
+ Uri childDocumentsUri = DocumentsContract.buildChildDocumentsUriUsingTree(parentDocumentUri, DocumentsContract.getDocumentId(parentDocumentUri));
+ ContentResolver contentResolver = AndroidMeApp.getIntance().getContentResolver();
+ Cursor c = contentResolver.query(childDocumentsUri, new String[]{DocumentsContract.Document.COLUMN_DOCUMENT_ID, DocumentsContract.Document.COLUMN_DISPLAY_NAME, DocumentsContract.Document.COLUMN_MIME_TYPE}, null, null, null);
+ return new CursorEnumeration(c);
+ }
+
+ private static class CursorEnumeration implements Enumeration<String> {
+
+ Cursor cursor;
+ boolean hasNext;
+
+ public CursorEnumeration(Cursor cursor) {
+ this.cursor = cursor;
+ this.hasNext = cursor.moveToNext();
+ }
+
+ @Override
+ public boolean hasMoreElements() {
+ return hasNext;
+ }
+
+ @Override
+ public String nextElement() {
+ final String name = cursor.getString(1);
+ final String mime = cursor.getString(2);
+
+ hasNext = cursor.moveToNext();
+ return DocumentsContract.Document.MIME_TYPE_DIR.equals(mime) ? name + "/" : name;
+ }
+
+ @Override
+ protected void finalize() {
+ close(cursor);
+ }
+ }
+
+ @Override
+ public DataInputStream openDataInputStream() throws IOException {
+ return new DataInputStream(openInputStream());
+ }
+
+ @Override
+ public DataOutputStream openDataOutputStream() throws IOException {
+ return new DataOutputStream(openOutputStream());
+ }
+
+ @Override
+ public InputStream openInputStream() throws IOException {
+ return AndroidMeApp.getIntance().getContentResolver().openInputStream(getAndroidDocumentUri());
+ }
+
+ @Override
+ public OutputStream openOutputStream() throws IOException {
+ return AndroidMeApp.getIntance().getContentResolver().openOutputStream(getAndroidDocumentUri());
+ }
+
+
+
+
+
+
+
+ @Override
+ public void mkdir() throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public String getPath() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public boolean isDirectory() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public boolean isHidden() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public boolean isOpen() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public long lastModified() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public long availableSize() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public boolean canRead() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public boolean canWrite() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void create() throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void delete() throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public long directorySize(boolean includeSubDirs) throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public OutputStream openOutputStream(long byteOffset) throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void rename(String newName) throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void setHidden(boolean hidden) throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void setReadable(boolean readable) throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void setWritable(boolean writable) throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public long totalSize() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void truncate(long byteOffset) throws IOException {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public long usedSize() {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void close() throws IOException {
+
+ }
+}
Modified: AndroidME/src_MIDP/javax/microedition/io/Connector.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/io/Connector.java 2024-09-15 12:40:20 UTC (rev 2796)
+++ AndroidME/src_MIDP/javax/microedition/io/Connector.java 2024-10-13 00:26:29 UTC (rev 2797)
@@ -9,6 +9,7 @@
import net.yura.android.io.AndroidURLConnection;
import net.yura.android.io.ServerSocketConnection;
import net.yura.android.io.SocketConnection;
+import net.yura.android.io.StorageAccessConnection;
import net.yura.android.messaging.MessageConnectionImpl;
import net.yura.midp.io.HttpConnectionImpl;
import net.yura.midp.io.HttpsConnectionImpl;
@@ -20,6 +21,7 @@
public static final int READ_WRITE = READ | WRITE;
private static final String PROTOCOL_ASSET = "file:///android_asset/";
+ private static final String PROTOCOL_STORAGE_ACCESS = "content://com.android.externalstorage.documents/";
private static final String PROTOCOL_FILE = "file:";
private static final String PROTOCOL_SOCKET = "socket:";
private static final String PROTOCOL_SSL = "ssl:";
@@ -37,6 +39,9 @@
if (name.startsWith(PROTOCOL_ASSET)) {
connection = new AndroidAssetConnection(name.substring( PROTOCOL_ASSET.length() ));
}
+ else if (name.startsWith(PROTOCOL_STORAGE_ACCESS)) {
+ connection = new StorageAccessConnection(name);
+ }
else if (name.startsWith(PROTOCOL_FILE)) {
connection = new JavaFileConnection(name);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-09-15 12:40:22
|
Revision: 2796
http://sourceforge.net/p/swingme/code/2796
Author: yuranet
Date: 2024-09-15 12:40:20 +0000 (Sun, 15 Sep 2024)
Log Message:
-----------
better audio control
Modified Paths:
--------------
AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/AudioPlayer.java
AndroidME/src_MIDP/javax/microedition/media/PlayerListener.java
Modified: AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/AudioPlayer.java
===================================================================
--- AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/AudioPlayer.java 2024-09-15 11:40:59 UTC (rev 2795)
+++ AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/AudioPlayer.java 2024-09-15 12:40:20 UTC (rev 2796)
@@ -37,6 +37,9 @@
player.setOnErrorListener(this);
}
+ /**
+ * This is called when NOT looped and when we reach the end of the sound
+ */
@Override
public void onCompletion(MediaPlayer mp) {
playing.remove(player);
@@ -103,14 +106,14 @@
}
@Override
- protected void doStop() {
- player.stop();
+ protected void doStop() throws MediaException {
+ player.pause();
playing.remove(player);
}
@Override
protected void doDeallocate() {
-
+ player.stop();
}
@Override
Modified: AndroidME/src_MIDP/javax/microedition/media/PlayerListener.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/media/PlayerListener.java 2024-09-15 11:40:59 UTC (rev 2795)
+++ AndroidME/src_MIDP/javax/microedition/media/PlayerListener.java 2024-09-15 12:40:20 UTC (rev 2796)
@@ -5,6 +5,10 @@
static String DEVICE_AVAILABLE = "deviceAvailable";
static String DEVICE_UNAVAILABLE = "deviceUnavailable";
static String DURATION_UPDATED = "durationUpdated";
+
+ /**
+ * When looping: An END_OF_MEDIA event will be posted every time the Player reaches the end of media.
+ */
static String END_OF_MEDIA = "endOfMedia";
static String ERROR = "error";
static String STARTED = "started";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-09-15 11:41:02
|
Revision: 2795
http://sourceforge.net/p/swingme/code/2795
Author: yuranet
Date: 2024-09-15 11:40:59 +0000 (Sun, 15 Sep 2024)
Log Message:
-----------
can close from any state
Modified Paths:
--------------
me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
Modified: me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2024-09-15 11:34:29 UTC (rev 2794)
+++ me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2024-09-15 11:40:59 UTC (rev 2795)
@@ -155,15 +155,19 @@
public void closeImpl() {
LOGGER.fine("closeImpl: " + clip);
- clip.close();
- clip = null;
- try {
- audioInputStream.close();
+ if (clip != null) {
+ clip.close();
+ clip = null;
}
- catch(Exception ex) {
- ex.printStackTrace();
+ if (audioInputStream != null) {
+ try {
+ audioInputStream.close();
+ }
+ catch(Exception ex) {
+ ex.printStackTrace();
+ }
+ audioInputStream = null;
}
- audioInputStream = null;
}
public void update(LineEvent event) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-09-15 11:34:31
|
Revision: 2794
http://sourceforge.net/p/swingme/code/2794
Author: yuranet
Date: 2024-09-15 11:34:29 +0000 (Sun, 15 Sep 2024)
Log Message:
-----------
close audioInputStream before setting to null
Modified Paths:
--------------
me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
Modified: me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2024-09-15 00:49:41 UTC (rev 2793)
+++ me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2024-09-15 11:34:29 UTC (rev 2794)
@@ -157,6 +157,12 @@
LOGGER.fine("closeImpl: " + clip);
clip.close();
clip = null;
+ try {
+ audioInputStream.close();
+ }
+ catch(Exception ex) {
+ ex.printStackTrace();
+ }
audioInputStream = null;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-09-15 00:49:43
|
Revision: 2793
http://sourceforge.net/p/swingme/code/2793
Author: yuranet
Date: 2024-09-15 00:49:41 +0000 (Sun, 15 Sep 2024)
Log Message:
-----------
print trace only when needed
Modified Paths:
--------------
me4se/src/org/me4se/impl/BasicMMPlayer.java
Modified: me4se/src/org/me4se/impl/BasicMMPlayer.java
===================================================================
--- me4se/src/org/me4se/impl/BasicMMPlayer.java 2024-09-15 00:15:03 UTC (rev 2792)
+++ me4se/src/org/me4se/impl/BasicMMPlayer.java 2024-09-15 00:49:41 UTC (rev 2793)
@@ -119,7 +119,8 @@
try{
stop();
}
- catch(MediaException e){
+ catch(MediaException e) {
+ e.printStackTrace();
}
}
deallocateImpl();
@@ -204,12 +205,11 @@
//System.out.println("MMPlayer stop called");
if(state == CLOSED) throw new IllegalStateException();
if(state != STARTED) return;
- try{
+ try {
stopImpl();
ApplicationManager.getInstance().activePlayers.removeElement(this);
}
- catch(Exception e){
- e.printStackTrace();
+ catch (Exception e) {
MediaException mx = new MediaException(e.toString());
mx.initCause(e);
throw mx;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-09-15 00:15:06
|
Revision: 2792
http://sourceforge.net/p/swingme/code/2792
Author: yuranet
Date: 2024-09-15 00:15:03 +0000 (Sun, 15 Sep 2024)
Log Message:
-----------
start at start if re-started
Modified Paths:
--------------
me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
Modified: me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2024-09-14 23:54:29 UTC (rev 2791)
+++ me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2024-09-15 00:15:03 UTC (rev 2792)
@@ -128,11 +128,13 @@
// automatic looping, but we want to notify listeners on each end, so we do manual looping, line above
//clip.loop(loopCount);
- if(desiredTime != -1){
+ if (desiredTime != -1) {
clip.setMicrosecondPosition(desiredTime);
- desiredTime = 0;
}
-
+ // then when it just comes to an end naturally,
+ // next time we want to start again at the start
+ desiredTime = 0;
+
clip.start();
//state = STARTED;
@@ -140,6 +142,7 @@
}
public void stopImpl() throws Exception {
+ LOGGER.fine("stopImpl: " + clip);
if(clip != null){
desiredTime = clip.getMicrosecondPosition();
@@ -151,7 +154,7 @@
}
public void closeImpl() {
- LOGGER.info("closeImpl: " + clip);
+ LOGGER.fine("closeImpl: " + clip);
clip.close();
clip = null;
audioInputStream = null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-09-14 23:54:32
|
Revision: 2791
http://sourceforge.net/p/swingme/code/2791
Author: yuranet
Date: 2024-09-14 23:54:29 +0000 (Sat, 14 Sep 2024)
Log Message:
-----------
can stop and then play
Modified Paths:
--------------
me4se/src/javax/microedition/media/PlayerListener.java
me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
Modified: me4se/src/javax/microedition/media/PlayerListener.java
===================================================================
--- me4se/src/javax/microedition/media/PlayerListener.java 2024-09-14 19:27:42 UTC (rev 2790)
+++ me4se/src/javax/microedition/media/PlayerListener.java 2024-09-14 23:54:29 UTC (rev 2791)
@@ -6,70 +6,188 @@
*/
public interface PlayerListener {
- /**
- * @API JSR-135
- */
- public static final String BUFFERING_STARTED = "bufferingStarted";
+ /**
+ * @API JSR-135
+ *
+ * Posted when the <code>Player</code> enters into a buffering mode.
+ * Applications may require this event to handle other tasks.
+ * <p>
+ * When this event is received, the <code>eventData</code> parameter
+ * will be a <code>Long</code> object designating the media
+ * time when the buffering is started.
+ * <p>
+ * Value <code>bufferingStarted</code> is assigned to
+ * <code>BUFFERING_STARTED</code>.
+ */
+ public static final String BUFFERING_STARTED = "bufferingStarted";
- /**
- * @API JSR-135
- */
- public static final String BUFFERING_STOPPED = "bufferingStopped";
+ /**
+ * @API JSR-135
+ *
+ * Posted when the <code>Player</code> leaves the buffering mode.
+ * Applications may require this event to handle other tasks.
+ * <p>
+ * When this event is received, the <code>eventData</code> parameter
+ * will be a <code>Long</code> object designating the media
+ * time when the buffering stopped.
+ * <p>
+ * Value <code>bufferingStopped</code> is assigned to
+ * <code>BUFFERING_STOPPED</code>.
+ */
+ public static final String BUFFERING_STOPPED = "bufferingStopped";
- /**
- * @API MIDP-2.0
- * @API MMAPI-1.0
- */
- public static final String CLOSED = "closed";
+ /**
+ * @API MIDP-2.0
+ * @API MMAPI-1.0
+ *
+ * Posted when a <code>Player</code> is closed. When this event is received,
+ * the <code>eventData</code> parameter is null.
+ * <p>
+ * Value <code>closed</code> is assigned to <code>CLOSED</code>.
+ */
+ public static final String CLOSED = "closed";
/**
* @API MIDP-2.0
* @API MMAPI-1.0
- */
+ *
+ * Posted when the system or another higher priority
+ * application has released an exclusive device
+ * which is now available to the <code>Player</code>.
+ * <p>
+ * The <code>Player</code> will be in the <i>REALIZED</i>
+ * state when this event is received. The application
+ * may acquire the device with the
+ * <code>prefetch</code> or <code>start</code> method.
+ * <p>
+ * A <code>DEVICE_UNAVAILABLE</code> event must
+ * preceed this event.
+ * <p>
+ * The <code>eventData</code> parameter is a <code>String</code>
+ * specifying the name of the device.
+ * <p>
+ * Value <code>deviceAvailable</code> is assigned to
+ * <code>DEVICE_AVAILABLE</code>.
+ */
public static final String DEVICE_AVAILABLE = "deviceAvailable";
/**
* @API MIDP-2.0
* @API MMAPI-1.0
- */
+ *
+ * Posted when the system or another higher priority
+ * application has temporarily taken control of an
+ * exclusive device which was
+ * previously available to the <code>Player</code>.
+ * <p>
+ * The <code>Player</code> will be in the <i>REALIZED</i>
+ * state when this event is received.
+ * <p>
+ * This event must
+ * be followed by either a <code>DEVICE_AVAILABLE</code>
+ * event when the device becomes available again,
+ * or an <code>ERROR</code> event if the device
+ * becomes permanently unavailable.
+ * <p>
+ * The <code>eventData</code> parameter is a <code>String</code>
+ * specifying the name of the device.
+ * <p>
+ * Value <code>deviceUnavailable</code> is assigned to
+ * <code>DEVICE_UNAVAILABLE</code>.
+ */
public static final String DEVICE_UNAVAILABLE = "deviceUnavailable";
- /**
- * @API MIDP-2.0
- * @API MMAPI-1.0
- */
- public static final String DURATION_UPDATED = "durationUpdated";
+ /**
+ * @API MIDP-2.0
+ * @API MMAPI-1.0
+ *
+ * Posted when the duration of a <code>Player</code> is updated.
+ * This happens for some media types where the duration cannot
+ * be derived ahead of time. It can only be derived after the
+ * media is played for a period of time -- for example, when it
+ * reaches a key frame with duration info; or when it reaches
+ * the end of media.
+ * <p>
+ * When this event is received, the <code>eventData</code> parameter
+ * will be a <code>Long</code> object designating the duration
+ * of the media.
+ * <p>
+ * Value <code>durationUpdated</code> is assigned to
+ * <code>DURATION_UPDATED</code>.
+ */
+ public static final String DURATION_UPDATED = "durationUpdated";
/**
* @API MIDP-2.0
* @API MMAPI-1.0
- */
+ *
+ * Posted when a <code>Player</code> has reached the
+ * end of the media.
+ * When this event is received, the <code>eventData</code> parameter
+ * will be a <code>Long</code> object designating the media
+ * time when the <code>Player</code> reached end of media and stopped.
+ * <p>
+ * Value <code>endOfMedia</code> is assigned to
+ * <code>END_OF_MEDIA</code>.
+ */
public static final String END_OF_MEDIA = "endOfMedia";
+
/**
* @API MIDP-2.0
* @API MMAPI-1.0
- */
+ *
+ * Posted when an error had occurred.
+ * When this event is received, the <code>eventData</code> parameter
+ * will be a <code>String</code> object specifying the error message.
+ * <p>
+ * Value <code>error</code> is assigned to <code>ERROR</code>.
+ */
public static final String ERROR = "error";
/**
* @API JSR-135
+ *
+ * Posted when an error occurs during the recording.
+ * The current recording will be discarded. The
+ * application may set a new record location or
+ * stream to start recording again.
+ * When this event is received, the <code>eventData</code> parameter
+ * will be a <code>String</code> object specifying the error message.
+ * <p>
+ * Value <code>recordError</code> is assigned to
+ * <code>RECORD_ERROR</code>.
*/
-
public static final String RECORD_ERROR = "recordError";
/**
* @API JSR-135
+ *
+ * Posted when recording is started.
+ * <p>
+ * When this event is received, the <code>eventData</code> parameter
+ * will be a <code>Long</code> object designating the media
+ * time when the recording is started.
+ * <p>
+ * Value <code>recordStarted</code> is assigned to
+ * <code>RECORD_STARTED</code>.
*/
+ public static final String RECORD_STARTED = "recordStarted";
- public static final String RECORD_STARTED = "recordStarted";
-
- /**
- * @API JSR-135
- */
-
- public static final String RECORD_STOPPED = "recordStopped";
+ /**
+ * @API JSR-135
+ *
+ * Posted when recording is stopped.
+ * <p>
+ * When this event is received, the <code>eventData</code> parameter
+ * will be a <code>Long</code> object designating the media
+ * time when the recording stopped.
+ * <p>
+ * Value <code>recordStopped</code> is assigned to
+ * <code>RECORD_STOPPED</code>.
+ */
+ public static final String RECORD_STOPPED = "recordStopped";
@@ -76,6 +194,17 @@
/**
* @API JSR-135
+ *
+ * Posted when the size of the video is changed either because
+ * the source video size or the display size is changed.
+ * When this event is received, the <code>eventData</code> parameter
+ * will be a <a href="control/VideoControl.html">
+ * <code>VideoControl</code></a>
+ * object. The new sizes
+ * can be queried from the <code>VideoControl</code>.
+ * <p>
+ * Value <code>sizeChanged</code> is assigned to
+ * <code>SIZE_CHANGED</code>.
*/
public static final String SIZE_CHANGED = "sizeChanged";
@@ -83,17 +212,42 @@
/**
* @API MIDP-2.0
* @API MMAPI-1.0
- */
+ *
+ * Posted when a <code>Player</code> is started.
+ * When this event is received, the <code>eventData</code> parameter
+ * will be a <code>Long</code> object designating the media
+ * time when the <code>Player</code> is started.
+ * <p>
+ * Value <code>started</code> is assigned to <code>STARTED</code>.
+ */
public static final String STARTED = "started";
/**
* @API MIDP-2.0
* @API MMAPI-1.0
- */
+ *
+ * Posted when a <code>Player</code> stops in response to the
+ * <code>stop</code> method call.
+ * When this event is received, the <code>eventData</code> parameter
+ * will be a <code>Long</code> object designating the media
+ * time when the <code>Player</code> stopped.
+ * <p>
+ * Value <code>stopped</code> is assigned to <code>STOPPED</code>.
+ */
public static final String STOPPED = "stopped";
/**
* @API JSR-135
+ *
+ * Posted when a <code>Player</code> is stopped as responding to
+ * the <code>setStopTime</code> call using the
+ * <code>StopTimeControl</code>.
+ * When this event is received, the <code>eventData</code> parameter
+ * will be a <code>Long</code> object designating the media
+ * time when the <code>Player</code> is stopped.
+ * <p>
+ * Value <code>stoppedAtTime</code> is assigned to
+ * <code>STOPPED_AT_TIME</code>.
*/
public static final String STOPPED_AT_TIME = "stoppedAtTime";
@@ -100,10 +254,20 @@
/**
- * @API MIDP-2.0
- * @API MMAPI-1.0
- */
- public static final String VOLUME_CHANGED = "volumeChanged";
+ * @API MIDP-2.0
+ * @API MMAPI-1.0
+ *
+ * Posted when the volume of an audio device is changed.
+ * When this event is received, the <code>eventData</code> parameter
+ * will be a <a href="control/VolumeControl.html">
+ * <code>VolumeControl</code></a>
+ * object. The new volume
+ * can be queried from the <code>VolumeControl</code>.
+ * <p>
+ * Value <code>volumeChanged</code> is assigned to
+ * <code>VOLUME_CHANGED</code>.
+ */
+ public static final String VOLUME_CHANGED = "volumeChanged";
/**
Modified: me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java
===================================================================
--- me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2024-09-14 19:27:42 UTC (rev 2790)
+++ me4se/src/org/me4se/psi/java1/media/audio/WavePlayerImpl.java 2024-09-14 23:54:29 UTC (rev 2791)
@@ -25,7 +25,7 @@
private static final Set clipTooLong = new HashSet();
public WavePlayerImpl() {
- super(false);
+ super(true);
}
Clip clip;
@@ -63,8 +63,7 @@
public void startImpl() throws Exception {
LOGGER.fine("Start called for clip: "+clip);
- String filename = dataSource.getLocator();
-
+
if (clip == null) {
getAudioInputStream();
@@ -88,6 +87,7 @@
clip.open(audioInputStream);
}
else {
+ String filename = dataSource.getLocator();
int ch = audioFormat.getChannels();
float rate = audioFormat.getSampleRate();
AudioFormat af = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED, rate, 16, ch, ch * 2, rate, false);
@@ -122,33 +122,40 @@
}
}
+ // setup manual looping
clip.addLineListener(this);
+ }
+ // automatic looping, but we want to notify listeners on each end, so we do manual looping, line above
+ //clip.loop(loopCount);
+
+ if(desiredTime != -1){
+ clip.setMicrosecondPosition(desiredTime);
+ desiredTime = 0;
+ }
- if(desiredTime != -1){
- clip.setMicrosecondPosition(desiredTime);
- desiredTime = 0;
- }
-
- clip.start();
+ clip.start();
- state = STARTED;
- startListenerNotification(PlayerListener.STARTED, null);
- }
+ //state = STARTED;
+ //startListenerNotification(PlayerListener.STARTED, null);
}
- public void stopImpl() throws Exception{
+ public void stopImpl() throws Exception {
+
if(clip != null){
desiredTime = clip.getMicrosecondPosition();
if(desiredTime >= clip.getMicrosecondLength()){
desiredTime = 0;
}
- Clip save = clip;
- clip = null;
-
- save.stop();
- save.close();
+ clip.stop();
}
}
+
+ public void closeImpl() {
+ LOGGER.info("closeImpl: " + clip);
+ clip.close();
+ clip = null;
+ audioInputStream = null;
+ }
public void update(LineEvent event) {
LOGGER.fine("Event: "+event +"; clip: "+clip);
@@ -155,7 +162,7 @@
LineEvent.Type type = event.getType();
- if(type.equals(LineEvent.Type.STOP)){
+ if (type.equals(LineEvent.Type.STOP) && state == STARTED) {
if(clip != null && (loopCount > 1 || loopCount == -1)){
notifyListeners(PlayerListener.END_OF_MEDIA, null);
clip.setMicrosecondPosition(0);
@@ -165,15 +172,15 @@
}
}
else{
- if(state == STARTED){
+ //if(state == STARTED){
state = PREFETCHED;
- }
+ //}
ApplicationManager.getInstance().activePlayers.removeElement(this);
- notifyListeners(PlayerListener.STOPPED, null);
- if(clip != null){
- clip.close();
- clip = null;
- }
+ notifyListeners(PlayerListener.END_OF_MEDIA, null);
+ //if(clip != null){
+ // clip.close();
+ // clip = null;
+ //}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-09-14 19:27:45
|
Revision: 2790
http://sourceforge.net/p/swingme/code/2790
Author: yuranet
Date: 2024-09-14 19:27:42 +0000 (Sat, 14 Sep 2024)
Log Message:
-----------
can pause when window Deactivated
Modified Paths:
--------------
me4se/src/javax/microedition/midlet/ApplicationManager.java
Modified: me4se/src/javax/microedition/midlet/ApplicationManager.java
===================================================================
--- me4se/src/javax/microedition/midlet/ApplicationManager.java 2024-09-14 16:39:30 UTC (rev 2789)
+++ me4se/src/javax/microedition/midlet/ApplicationManager.java 2024-09-14 19:27:42 UTC (rev 2790)
@@ -30,6 +30,7 @@
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.KeyEvent;
+import java.awt.event.WindowEvent;
import java.awt.image.BufferedImage;
import java.io.BufferedInputStream;
import java.io.ByteArrayInputStream;
@@ -42,6 +43,7 @@
import java.io.InputStream;
import java.lang.reflect.Field;
import java.net.URL;
+import java.util.Arrays;
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Locale;
@@ -48,6 +50,8 @@
import java.util.Properties;
import java.util.StringTokenizer;
import java.util.Vector;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import javax.imageio.ImageIO;
import javax.microedition.lcdui.Canvas;
@@ -649,9 +653,34 @@
200));
frame.addWindowListener(new java.awt.event.WindowAdapter() {
+ private Player[] pausedPlayers;
public void windowClosing(java.awt.event.WindowEvent ev) {
destroy(true, true); // notify, mayExit, killAll
}
+ public void windowDeactivated(WindowEvent e) {
+ //Logger.getLogger(ApplicationManager.class.getName()).info("STOPING " + activePlayers);
+ pausedPlayers = (Player[])activePlayers.toArray(new Player[0]);
+ for (int i = 0; i < pausedPlayers.length; i++) {
+ try {
+ pausedPlayers[i].stop();
+ } catch (Exception ex) {
+ Logger.getLogger(ApplicationManager.class.getName()).log(Level.SEVERE, "can not stop", ex);
+ }
+ }
+ }
+ public void windowActivated(WindowEvent e) {
+ //Logger.getLogger(ApplicationManager.class.getName()).info("STARTING " + Arrays.asList(pausedPlayers));
+ if (pausedPlayers != null) {
+ for (int i = 0; i < pausedPlayers.length; i++) {
+ try {
+ pausedPlayers[i].start();
+ } catch (Exception ex) {
+ Logger.getLogger(ApplicationManager.class.getName()).log(Level.SEVERE, "can not start", ex);
+ }
+ }
+ }
+ pausedPlayers = null;
+ }
});
awtContainer = frame;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-09-14 16:39:32
|
Revision: 2789
http://sourceforge.net/p/swingme/code/2789
Author: yuranet
Date: 2024-09-14 16:39:30 +0000 (Sat, 14 Sep 2024)
Log Message:
-----------
catch any errors in audio start stop
Modified Paths:
--------------
AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/AudioPlayer.java
Modified: AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/AudioPlayer.java
===================================================================
--- AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/AudioPlayer.java 2024-09-14 16:31:23 UTC (rev 2788)
+++ AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/AudioPlayer.java 2024-09-14 16:39:30 UTC (rev 2789)
@@ -3,6 +3,7 @@
import android.content.res.AssetFileDescriptor;
import android.media.MediaPlayer;
import net.yura.android.AndroidMeApp;
+import net.yura.mobile.logging.Logger;
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
@@ -49,15 +50,25 @@
}
public static void onPause() {
- for (MediaPlayer mp : playing) {
- mp.pause();
+ try {
+ for (MediaPlayer mp : playing) {
+ mp.pause();
+ }
}
+ catch (Exception ex) {
+ Logger.warn("unable to pause: " + playing, ex);
+ }
}
public static void onResume() {
- for (MediaPlayer mp : playing) {
- mp.start();
+ try {
+ for (MediaPlayer mp : playing) {
+ mp.start();
+ }
}
+ catch (Exception ex) {
+ Logger.warn("unable to resume: " + playing, ex);
+ }
}
@Override
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-09-14 16:31:25
|
Revision: 2788
http://sourceforge.net/p/swingme/code/2788
Author: yuranet
Date: 2024-09-14 16:31:23 +0000 (Sat, 14 Sep 2024)
Log Message:
-----------
pause sounds when closing app
Modified Paths:
--------------
AndroidME/src_Android/net/yura/android/AndroidMeActivity.java
AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/AudioPlayer.java
AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/BasicPlayer.java
AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/CameraPlayer.java
Modified: AndroidME/src_Android/net/yura/android/AndroidMeActivity.java
===================================================================
--- AndroidME/src_Android/net/yura/android/AndroidMeActivity.java 2024-09-14 12:02:51 UTC (rev 2787)
+++ AndroidME/src_Android/net/yura/android/AndroidMeActivity.java 2024-09-14 16:31:23 UTC (rev 2788)
@@ -24,6 +24,7 @@
import android.widget.ArrayAdapter;
import android.widget.ListView;
import android.widget.TextView;
+import javax.microedition.media.player.AudioPlayer;
public class AndroidMeActivity extends Activity implements OnItemClickListener {
@@ -119,6 +120,8 @@
if (wl!=null) {
wl.acquire();
}
+
+ AudioPlayer.onResume();
}
@Override
@@ -128,6 +131,8 @@
Logger.info("[AndroidMeActivity] onPause");
foreground = false;
+ AudioPlayer.onPause();
+
if (wl!=null) {
try {
wl.release();
Modified: AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/AudioPlayer.java
===================================================================
--- AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/AudioPlayer.java 2024-09-14 12:02:51 UTC (rev 2787)
+++ AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/AudioPlayer.java 2024-09-14 16:31:23 UTC (rev 2788)
@@ -4,11 +4,16 @@
import android.media.MediaPlayer;
import net.yura.android.AndroidMeApp;
import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
import javax.microedition.media.Control;
import javax.microedition.media.MediaException;
+import javax.microedition.media.PlayerListener;
-public class AudioPlayer extends BasicPlayer {
+public class AudioPlayer extends BasicPlayer implements MediaPlayer.OnCompletionListener, MediaPlayer.OnErrorListener {
+ private static final List<MediaPlayer> playing = new ArrayList<>();
+
private final MediaPlayer player;
public AudioPlayer(String locator) throws MediaException, IOException {
@@ -26,9 +31,36 @@
//player.setDataSource(locator); // need to ONLY pass the path
throw new MediaException("can not handle: " + locator);
}
+
+ player.setOnCompletionListener(this);
+ player.setOnErrorListener(this);
}
@Override
+ public void onCompletion(MediaPlayer mp) {
+ playing.remove(player);
+ sendListenerEvent(PlayerListener.END_OF_MEDIA, null);
+ }
+
+ @Override
+ public boolean onError(MediaPlayer mp, int what, int extra) {
+ sendListenerEvent(PlayerListener.ERROR, what + " " + extra);
+ return false;
+ }
+
+ public static void onPause() {
+ for (MediaPlayer mp : playing) {
+ mp.pause();
+ }
+ }
+
+ public static void onResume() {
+ for (MediaPlayer mp : playing) {
+ mp.start();
+ }
+ }
+
+ @Override
public void setLoopCount(int count) throws IllegalArgumentException, IllegalStateException {
super.setLoopCount(count);
@@ -56,21 +88,23 @@
@Override
protected void doStart() throws MediaException {
player.start();
+ playing.add(player);
}
@Override
protected void doStop() {
player.stop();
+ playing.remove(player);
}
@Override
protected void doDeallocate() {
- player.release();
+
}
@Override
protected void doClose() {
-
+ player.release();
}
@Override
@@ -101,6 +135,8 @@
@Override
public String getContentType() {
+ // getTrackInfo returns a empty array, so this does not work
+ //return player.getTrackInfo()[0].getFormat().getString(MediaFormat.KEY_MIME);
return null;
}
}
Modified: AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/BasicPlayer.java
===================================================================
--- AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/BasicPlayer.java 2024-09-14 12:02:51 UTC (rev 2787)
+++ AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/BasicPlayer.java 2024-09-14 16:31:23 UTC (rev 2788)
@@ -20,7 +20,8 @@
abstract protected void doRealize() throws MediaException;
abstract protected void doPrefetch() throws MediaException;
abstract protected void doStart() throws MediaException;
- abstract protected void doStop();
+ abstract protected void doStop() throws MediaException;
+
abstract protected void doDeallocate();
abstract protected void doClose();
@@ -30,8 +31,6 @@
abstract protected Control[] doGetControls();
abstract protected Control doGetControl(String type);
-
-
/**
* Check to see if the Player is closed. If the
* unrealized boolean flag is true, check also to
@@ -101,17 +100,13 @@
}
}
- public synchronized void stop() {
+ public synchronized void stop() throws MediaException {
chkClosed(false);
//JP loopAfterEOM = false;
if (state >= STARTED) {
- try {
- sendPlayerEvent("doStop", null);
- }
- catch (Exception e) {
- }
+ sendPlayerEvent("doStop", null);
state = PREFETCHED;
sendListenerEvent(PlayerListener.STOPPED, new Long(getMediaTime()));
@@ -124,11 +119,20 @@
//JP loopAfterEOM = false;
if (state >= PREFETCHED) {
- stop();
+ // j2me javadoc: If the Player is STARTED when deallocate is called, deallocate will implicitly call stop on the Player.
try {
+ stop();
+ }
+ catch (MediaException ex) {
+ // does not say in docs what is done if this error happens????
+ ex.printStackTrace();
+ }
+ try {
sendPlayerEvent("doDeallocate", null);
}
- catch (MediaException e) {
+ catch (MediaException ex) {
+ // deallocate does not throw a MediaException, so this should never happen
+ ex.printStackTrace();
}
state = REALIZED;
}
@@ -141,6 +145,8 @@
sendPlayerEvent("doClose", null);
}
catch (MediaException e) {
+ // close does not throw a MediaException, so this should never happen
+ e.printStackTrace();
}
state = CLOSED;
@@ -208,7 +214,6 @@
AndroidMeApp.getIntance().invokeLater(
new Runnable() {
-
public void run() {
doListenerEvent(evt, evtData);
}
@@ -254,22 +259,22 @@
}
void doPlayerEvent(final String evt, final Object evtData) throws MediaException {
- if (evt == "doRealize") {
+ if ("doRealize".equals(evt)) {
doRealize();
}
- else if (evt == "doPrefetch") {
+ else if ("doPrefetch".equals(evt)) {
doPrefetch();
}
- else if (evt == "doStart") {
+ else if ("doStart".equals(evt)) {
doStart();
}
- else if (evt == "doStop") {
+ else if ("doStop".equals(evt)) {
doStop();
}
- else if (evt == "doDeallocate") {
+ else if ("doDeallocate".equals(evt)) {
doDeallocate();
}
- else if (evt == "doClose") {
+ else if ("doClose".equals(evt)) {
doClose();
}
}
Modified: AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/CameraPlayer.java
===================================================================
--- AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/CameraPlayer.java 2024-09-14 12:02:51 UTC (rev 2787)
+++ AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/CameraPlayer.java 2024-09-14 16:31:23 UTC (rev 2788)
@@ -238,7 +238,7 @@
void doPlayerEvent(String evt, Object evtData) throws MediaException {
super.doPlayerEvent(evt, evtData);
- if (evt == "doInitDisplayMode") {
+ if ("doInitDisplayMode".equals(evt)) {
Context context = canvas.getView().getContext();
preview = new Preview(context);
@@ -255,7 +255,7 @@
updateView();
}
- else if (evt == "doSetVisible") {
+ else if ("doSetVisible".equals(evt)) {
boolean flag = (Boolean) evtData;
if (flag) {
canvas.addOverlayView(preview);
@@ -267,7 +267,7 @@
}
void doListenerEvent(String evt, Object evtData) {
- if (evt == "updateView") {
+ if ("updateView".equals(evt)) {
if (preview != null) {
if (fullScreen) {
preview.layout(0, 0, canvas.getWidth(), canvas.getHeight());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2024-09-14 12:02:53
|
Revision: 2787
http://sourceforge.net/p/swingme/code/2787
Author: yuranet
Date: 2024-09-14 12:02:51 +0000 (Sat, 14 Sep 2024)
Log Message:
-----------
support looping
Modified Paths:
--------------
AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/AudioPlayer.java
AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/BasicPlayer.java
Modified: AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/AudioPlayer.java
===================================================================
--- AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/AudioPlayer.java 2024-09-07 22:31:32 UTC (rev 2786)
+++ AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/AudioPlayer.java 2024-09-14 12:02:51 UTC (rev 2787)
@@ -29,6 +29,14 @@
}
@Override
+ public void setLoopCount(int count) throws IllegalArgumentException, IllegalStateException {
+ super.setLoopCount(count);
+
+ player.setLooping(count == -1);
+ // TODO support looping other numbers
+ }
+
+ @Override
protected void doRealize() throws MediaException {
}
Modified: AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/BasicPlayer.java
===================================================================
--- AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/BasicPlayer.java 2024-09-07 22:31:32 UTC (rev 2786)
+++ AndroidME/src_JSR135_Multimedia/javax/microedition/media/player/BasicPlayer.java 2024-09-14 12:02:51 UTC (rev 2787)
@@ -49,10 +49,10 @@
public void setLoopCount(int count) throws IllegalArgumentException, IllegalStateException {
chkClosed(false);
if (state == STARTED) {
- throw new IllegalStateException("setLoopCount");
+ throw new IllegalStateException("setLoopCount state == STARTED");
}
if (count == 0 || count < -1) {
- throw new IllegalArgumentException("setLoopCount");
+ throw new IllegalArgumentException("setLoopCount: " + count);
}
//JP loopCountSet = count;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
