sync patch circular import fix2

Author: Fector101

android_notify/config.py

@@ -2,10 +2,8 @@
 
 __version__ = "1.61.3"
 
-from .internal.java_classes import autoclass, cast, NotificationManager
 from .internal.logger import logger
 
-
 def on_kivy_android():
     kivy_build = os.environ.get('KIVY_BUILD', '')
     if kivy_build in {'android'}:
@@ -26,6 +24,37 @@ def on_android_platform():
     return on_kivy_android() or on_flet_app()
 
 
+if on_android_platform():
+    try:
+        from jnius import cast, autoclass
+    except ModuleNotFoundError:
+        cast = lambda x, y: x
+        autoclass = lambda x: None
+else:
+    cast = lambda x, y: x
+    autoclass = lambda x: None
+
+
+def on_pydroid_app():
+    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:
+        _=autoclass('androidx.core.app.NotificationCompat')
+        return True
+    except Exception:
+        return False
+
+
 def get_activity_class_name():
     ACTIVITY_CLASS_NAME = os.getenv("MAIN_ACTIVITY_HOST_CLASS_NAME")  # flet python
     if not ACTIVITY_CLASS_NAME:
@@ -98,6 +127,7 @@ def get_notification_manager():
     if not on_android_platform():
         logger.warning("Can't get notification manager, Not on Android.")
         return None
+    NotificationManager = autoclass('android.app.NotificationManager')
 
     context = get_python_activity_context()
     notification_service = context.getSystemService(context.NOTIFICATION_SERVICE)

android_notify/core.py

@@ -3,9 +3,8 @@
 import os
 
 from android_notify.internal.logger import logger
-from android_notify.internal.helper import on_pydroid_app
 
-from android_notify.config import get_python_activity, on_android_platform, get_python_activity_context, on_flet_app
+from android_notify.config import get_python_activity, on_android_platform, get_python_activity_context, on_flet_app, on_pydroid_app
 from android_notify.internal.permissions import has_notification_permission, ask_notification_permission
 from android_notify.internal.java_classes import autoclass, BuildVersion, BitmapFactory, NotificationChannel, NotificationManagerCompat, NotificationCompat, NotificationCompatBuilder, \
     NotificationCompatBigTextStyle, NotificationCompatBigPictureStyle, NotificationCompatInboxStyle, IconClass

android_notify/internal/helper.py

@@ -1,7 +1,7 @@
 """Collection of useful functions"""
 
 import inspect, os, re
-from .logger import logger, on_android_platform
+from .logger import logger
 
 def can_accept_arguments(func, *args, **kwargs):
     try:
@@ -54,24 +54,3 @@ def execute_callback(callback,arg, from_who="user"):
             callback()
     except Exception as on_permissions_result_callback_error:
         logger.exception(on_permissions_result_callback_error)
-
-def on_pydroid_app():
-    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():
-        from android_notify.config import get_package_name
-        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,21 +1,7 @@
-import os
 
-from .helper import has_androidx_dependency, on_pydroid_app
+from android_notify.config import has_androidx_dependency,on_pydroid_app, on_android_platform,on_flet_app
 from .logger import logger
 
-def on_android_platform():
-    kivy_build = os.environ.get('KIVY_BUILD', '')
-    if kivy_build in {'android'}:
-        return True
-    elif 'P4A_BOOTSTRAP' in os.environ:
-        return True
-    elif 'ANDROID_ARGUMENT' in os.environ:
-        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

android_notify/internal/permissions.py

@@ -4,9 +4,9 @@
 import os.path
 
 from .logger import logger
-from android_notify.config import on_android_platform, on_flet_app, get_python_activity_context
+from android_notify.config import on_android_platform, on_flet_app, get_python_activity_context, on_pydroid_app, has_androidx_dependency
 from android_notify.internal.java_classes import autoclass, BuildVersion, Manifest, Intent, String, Settings, Uri, PackageManager, NotificationManagerCompat
-from android_notify.internal.helper import execute_callback, on_pydroid_app, has_androidx_dependency
+from android_notify.internal.helper import execute_callback
 
 
 def check_notification_permission_legacy_android12_below():

android_notify/widgets/images.py

@@ -3,9 +3,9 @@
 """
 import os
 
-from android_notify.config import app_storage_path, on_flet_app, on_android_platform, get_python_activity_context
+from android_notify.config import app_storage_path, on_flet_app, on_android_platform, get_python_activity_context, on_pydroid_app
 from android_notify.internal.java_classes import autoclass, BitmapFactory, Uri, BuildVersion, Color, IconClass
-from android_notify.internal.helper import get_package_path, on_pydroid_app
+from android_notify.internal.helper import get_package_path
 from android_notify.internal.logger import logger