sync passed basic test

Author: Fector101

android_notify/internal/android.py

@@ -1,14 +1,14 @@
 """
 Android related logic
 """
-import time
+import time, os
 
 from .logger import logger
 from ..config import get_notification_manager, on_android_platform, from_service_file, on_flet_app, \
     get_python_activity_context
 from .permissions import has_notification_permission
 from .java_classes import autoclass, BuildVersion, Uri, NotificationCompat, NotificationManagerCompat, \
-    NotificationManager, Context
+    NotificationManager, Context, File
 from .an_types import Importance
 
 
@@ -98,22 +98,72 @@ def get_sound_uri(res_sound_name):
     return Uri.parse(f"android.resource://{package_name}/raw/{res_sound_name}")
 
 
-def set_sound(builder, res_sound_name):
+def get_sound_uri_from_path(sound_path):
+    if not on_android_platform() or not sound_path:
+        return None
+
+    if sound_path.startswith("content://") or sound_path.startswith("file://") or sound_path.startswith("android.resource://"):
+        try:
+            return Uri.parse(sound_path)
+        except Exception as e:
+            logger.exception(f"Error parsing sound URI: {sound_path}")
+            return None
+
+    # Resolve relative paths
+    abs_path = os.path.abspath(sound_path)
+    if not os.path.exists(abs_path):
+        logger.warning(f"Sound file does not exist: {sound_path} (resolved to {abs_path})")
+        return None
+
+    # Check if the file is in private storage (contains /data/)
+    if "/data/" in abs_path or not (abs_path.startswith("/storage") or abs_path.startswith("/sdcard")):
+        try:
+            context = get_python_activity_context()
+            ext_files = context.getExternalFilesDir("Notifications")
+            if ext_files:
+                ext_files_path = ext_files.getAbsolutePath()
+                dest_file = os.path.join(ext_files_path, os.path.basename(abs_path))
+
+                # Copy if destination doesn't exist or is older than the source
+                if not os.path.exists(dest_file) or os.path.getmtime(abs_path) > os.path.getmtime(dest_file):
+                    import shutil
+                    shutil.copy2(abs_path, dest_file)
+                abs_path = dest_file
+        except Exception as copy_error:
+            logger.exception(f"Failed to copy private sound file {abs_path} to external files: {copy_error}")
+
+    try:
+        java_file = File(abs_path)
+        return Uri.fromFile(java_file)
+    except Exception as e:
+        logger.exception(f"Error generating Uri from file path: {abs_path}")
+        return None
+
+
+def set_sound(builder, res_sound_name=None, sound_path=None):
     """
     Sets sound for devices less than android 8 (For 8+ use createChannel)
     :param builder: builder instance
     :param res_sound_name: audio file name (without .wav or .mp3) locate in res/raw/
+    :param sound_path: local file path or uri string
     """
 
     if not on_android_platform():
         return None
 
-    if res_sound_name and BuildVersion.SDK_INT < 26:
-        try:
-            builder.setSound(get_sound_uri(res_sound_name))
-            return True
-        except Exception as failed_adding_sound_for_devices_below_android8:
-            logger.exception(failed_adding_sound_for_devices_below_android8)
+    if BuildVersion.SDK_INT < 26:
+        sound_uri = None
+        if sound_path:
+            sound_uri = get_sound_uri_from_path(sound_path)
+        elif res_sound_name:
+            sound_uri = get_sound_uri(res_sound_name)
+
+        if sound_uri:
+            try:
+                builder.setSound(sound_uri)
+                return True
+            except Exception as failed_adding_sound_for_devices_below_android8:
+                logger.exception(failed_adding_sound_for_devices_below_android8)
     return None
 
 

android_notify/internal/channels.py

@@ -5,9 +5,9 @@
 
 from android_notify.config import get_notification_manager, on_android_platform
 
-from android_notify.internal.java_classes import BuildVersion, NotificationChannel
+from android_notify.internal.java_classes import BuildVersion, NotificationChannel, AudioAttributes, AudioAttributesBuilder
 from android_notify.internal.an_types import Importance
-from android_notify.internal.android import get_sound_uri, get_android_importance
+from android_notify.internal.android import get_sound_uri, get_sound_uri_from_path, get_android_importance
 from android_notify.internal.logger import logger
 
 def does_channel_exist(channel_id):
@@ -24,35 +24,48 @@ def does_channel_exist(channel_id):
     return False
 
 
-def create_channel(id__, name: str, description='', importance: Importance = 'urgent', res_sound_name=None,vibrate=False):
+def create_channel(id__, name: str, description='', importance: Importance = 'urgent', res_sound_name=None, sound_path=None, vibrate=False):
     """
     Creates a user visible toggle button for specific notifications, Required For Android 8.0+
     :param id__: Used to send other notifications later through same channel.
     :param name: user-visible channel name.
     :param description: user-visible detail about channel (Not required defaults to empty str).
     :param importance: ['urgent', 'high', 'medium', 'low', 'none'] defaults to 'urgent' i.e. makes a sound and shows briefly
     :param res_sound_name: audio file name (without .wav or .mp3) locate in res/raw/
+    :param sound_path: local file path or uri string
     :param vibrate: if channel notifications should vibrate or not
     :return: boolean if channel created
     """
     def info_log():
         logger.info(
-            f"Created {name} channel, id: {id__}, description: {description}, res_sound_name: {res_sound_name},vibrate: {vibrate}")
+            f"Created {name} channel, id: {id__}, description: {description}, res_sound_name: {res_sound_name}, sound_path: {sound_path}, vibrate: {vibrate}")
 
     if not on_android_platform():
         info_log()
         return None
 
     notification_manager = get_notification_manager()
     android_importance_value = get_android_importance(importance)
-    sound_uri = get_sound_uri(res_sound_name)
+
+    if sound_path:
+        sound_uri = get_sound_uri_from_path(sound_path)
+    else:
+        sound_uri = get_sound_uri(res_sound_name)
 
     if not does_channel_exist(id__):
         channel = NotificationChannel(id__, name, android_importance_value)
         if description:
             channel.setDescription(description)
         if sound_uri:
-            channel.setSound(sound_uri, None)
+            try:
+                aa_builder = AudioAttributesBuilder()
+                aa_builder.setContentType(AudioAttributes.CONTENT_TYPE_SONIFICATION)
+                aa_builder.setUsage(AudioAttributes.USAGE_NOTIFICATION)
+                audio_attributes = aa_builder.build()
+                channel.setSound(sound_uri, audio_attributes)
+            except Exception as sound_attributes_error:
+                logger.warning(f"Could not build AudioAttributes, falling back to None: {sound_attributes_error}")
+                channel.setSound(sound_uri, None)
         if vibrate:
             # channel.setVibrationPattern([0, 500, 200, 500]) # Using Phone's default pattern
             # Android 15 ignored long patterns, didn't vibrate when not in silent and

android_notify/internal/facade.py

@@ -149,11 +149,9 @@ def getAbsolutePath(self):
         logger.debug(f"[MOCK] File.getAbsolutePath called, returning {self.path}")
         return self.path
 
-
 class NotificationManager:
     pass
 
-
 class NotificationChannel:
     def __init__(self, channel_id, channel_name, importance):
         self.description = None

android_notify/internal/helper.py

@@ -1,8 +1,8 @@
 """Collection of useful functions"""
 
 import inspect, os, re
-from .logger import logger
-
+from .logger import logger, on_android_platform
+from android_notify.config import get_package_name
 
 def can_accept_arguments(func, *args, **kwargs):
     try:
@@ -57,4 +57,21 @@ def execute_callback(callback,arg, from_who="user"):
         logger.exception(on_permissions_result_callback_error)
 
 def on_pydroid_app():
-    return "ru.iiec.pydroid3" in os.path.dirname(os.path.abspath(__file__))
+    package_name = "ru.iiec.pydroid3"
+    if package_name in os.environ.get("PYTHONHOME",""):
+        return True
+    elif package_name in os.path.dirname(os.path.abspath(__file__)):
+        return True
+    elif on_android_platform():
+        return package_name == get_package_name()
+    return False
+
+
+def has_androidx_dependency():
+    """Check if androidx dependencies are available"""
+    try:
+        from jnius import autoclass
+        autoclass('androidx.core.app.NotificationCompat')
+        return True
+    except Exception:
+        return False

android_notify/internal/java_classes.py

@@ -1,5 +1,6 @@
 import os
 
+from .helper import has_androidx_dependency, on_pydroid_app
 from .logger import logger
 
 def on_android_platform():
@@ -12,14 +13,16 @@ def on_android_platform():
         return True
     return os.getenv("MAIN_ACTIVITY_HOST_CLASS_NAME")
 
+def on_flet_app():
+    return os.getenv("MAIN_ACTIVITY_HOST_CLASS_NAME")
 
 if on_android_platform():
     try:
         from jnius import cast, autoclass
     except ModuleNotFoundError:
         cast = lambda x, y: x
         autoclass = lambda x: None
-        logger.exception("run pip install pyjnius")
+        logger.exception("add pyjnius to dependencies list")
 
     # Leaving this as a broad Exception for unforeseen case so apps don't crash
     # noinspection PyBroadException
@@ -38,32 +41,55 @@ def on_android_platform():
         Uri = autoclass("android.net.Uri")
         Manifest = autoclass('android.Manifest$permission')
         Context = autoclass('android.content.Context')
+        PackageManager = autoclass("android.content.pm.PackageManager")
+        AudioAttributes = autoclass('android.media.AudioAttributes')
+        AudioAttributesBuilder = autoclass('android.media.AudioAttributes$Builder')
+        File = autoclass('java.io.File')
         Color = autoclass('android.graphics.Color')
-        IconClass = autoclass('androidx.core.graphics.drawable.IconCompat')
     except Exception as e:
         from .facade import *
         logger.exception("Didn't get Basic Java Classes")
 
-    # noinspection PyBroadException
-    try:
-        NotificationManagerCompat = autoclass('androidx.core.app.NotificationManagerCompat')
-        NotificationCompat = autoclass('androidx.core.app.NotificationCompat')
-        NotificationCompatBuilder = autoclass('androidx.core.app.NotificationCompat$Builder')
+    if on_flet_app() or on_pydroid_app() or not has_androidx_dependency():
+        # Leaving this as a broad Exception for unforeseen case so apps don't crash
+        # noinspection PyBroadException
+        try:
+            IconClass = autoclass('android.graphics.drawable.Icon')
+            NotificationCompat = autoclass("android.app.Notification")
+            NotificationManagerCompat = autoclass('android.app.NotificationManager')
+            NotificationCompatBuilder = autoclass('android.app.Notification$Builder')
 
-        # Notification Design
-        NotificationCompatBigTextStyle = autoclass('androidx.core.app.NotificationCompat$BigTextStyle')
-        NotificationCompatBigPictureStyle = autoclass('androidx.core.app.NotificationCompat$BigPictureStyle')
-        NotificationCompatInboxStyle = autoclass('androidx.core.app.NotificationCompat$InboxStyle')
-        NotificationCompatDecoratedCustomViewStyle = autoclass('androidx.core.app.NotificationCompat$DecoratedCustomViewStyle')
+            NotificationCompatBigTextStyle = autoclass('android.app.Notification$BigTextStyle')
+            NotificationCompatBigPictureStyle = autoclass('android.app.Notification$BigPictureStyle')
+            NotificationCompatInboxStyle = autoclass('android.app.Notification$InboxStyle')
+            NotificationCompatDecoratedCustomViewStyle = autoclass('android.app.Notification$DecoratedCustomViewStyle')
+        except Exception as styles_import_error:
+            logger.exception(styles_import_error)
+            from .facade import *
+    elif has_androidx_dependency():
 
-    except Exception as dependencies_import_error:
-        logger.exception("""
-        Dependency Error: Add the following in buildozer.spec:
-        * android.gradle_dependencies = androidx.core:core:1.12.0
-        * android.enable_androidx = True
-        """)
+        # Leaving this as a broad Exception for unforeseen case so apps don't crash
+        # noinspection PyBroadException
+        try:
+            IconClass = autoclass('androidx.core.graphics.drawable.IconCompat')
+            NotificationCompat = autoclass('androidx.core.app.NotificationCompat')
+            NotificationManagerCompat = autoclass('androidx.core.app.NotificationManagerCompat')
+            NotificationCompatBuilder = autoclass('androidx.core.app.NotificationCompat$Builder')
 
-        from .facade import *
+            # Notification Design
+            NotificationCompatBigTextStyle = autoclass('androidx.core.app.NotificationCompat$BigTextStyle')
+            NotificationCompatBigPictureStyle = autoclass('androidx.core.app.NotificationCompat$BigPictureStyle')
+            NotificationCompatInboxStyle = autoclass('androidx.core.app.NotificationCompat$InboxStyle')
+            NotificationCompatDecoratedCustomViewStyle = autoclass('androidx.core.app.NotificationCompat$DecoratedCustomViewStyle')
+
+        except Exception as dependencies_import_error:
+            logger.exception("""
+            Dependency Error: Add the following in buildozer.spec:
+            * android.gradle_dependencies = androidx.core:core:1.12.0
+            * android.enable_androidx = True
+            """)
+
+            from .facade import *
 else:
     cast = lambda x, y: x
     autoclass = lambda x: None