From 55d26c32730111bd65fb805ea5d24ad0fb36655b Mon Sep 17 00:00:00 2001 From: Richard Tibbles Date: Thu, 9 Apr 2026 19:41:26 -0700 Subject: [PATCH] Fix hook imports to align with Kolibri PR #12879 - ShareFileHook moved from kolibri.core.device.hooks to kolibri.core.content.hooks - StorageHook renamed to JobHook in kolibri.core.tasks.hooks - Updated share_file signature to match new API (filename, message) Co-Authored-By: Claude Opus 4.6 (1M context) --- scripts/version.py | 2 +- src/android_app_plugin/kolibri_plugin.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/version.py b/scripts/version.py index b60c3016..7c9a34c4 100644 --- a/scripts/version.py +++ b/scripts/version.py @@ -5,7 +5,7 @@ from play_store_api import get_latest_version_code -android_installer_version = "0.1.8" +android_installer_version = "0.1.9" BUILD_TYPE_DEBUG = "debug" diff --git a/src/android_app_plugin/kolibri_plugin.py b/src/android_app_plugin/kolibri_plugin.py index e2248ac3..9176dfd5 100644 --- a/src/android_app_plugin/kolibri_plugin.py +++ b/src/android_app_plugin/kolibri_plugin.py @@ -5,10 +5,10 @@ from android_utils import share_by_intent from django.utils import timezone from jnius import autoclass +from kolibri.core.content.hooks import ShareFileHook from kolibri.core.device.hooks import CheckIsMeteredHook from kolibri.core.device.hooks import GetOSUserHook -from kolibri.core.device.hooks import ShareFileHook -from kolibri.core.tasks.hooks import StorageHook +from kolibri.core.tasks.hooks import JobHook from kolibri.core.tasks.job import Priority from kolibri.plugins import KolibriPluginBase from kolibri.plugins.hooks import register_hook @@ -43,12 +43,12 @@ def check_is_metered(self): @register_hook class AndroidShareFileHook(ShareFileHook): - def share_file(self, *args, **kwargs): - return share_by_intent(*args, **kwargs) + def share_file(self, filename, message): + return share_by_intent(filename, message) @register_hook -class StorageHook(StorageHook): +class AndroidJobHook(JobHook): def schedule( self, job,