forked from learningequality/kolibri-installer-android
-
Notifications
You must be signed in to change notification settings - Fork 0
WIP hook welcome screen with main script #27
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Draft
manuq
wants to merge
1
commit into
develop
Choose a base branch
from
T33565-welcome-wiring
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| package org.endlessos.Key; | ||
| import android.webkit.JavascriptInterface; | ||
| import android.util.Log; | ||
|
|
||
| public class WelcomeScreenInterface { | ||
|
|
||
| private static final String TAG = "WelcomeScreen"; | ||
|
|
||
| public void test() { | ||
| Log.d(TAG, "test called!"); | ||
| } | ||
|
|
||
| @JavascriptInterface | ||
| public void load() { | ||
| Log.d(TAG, "load called!"); | ||
| } | ||
| @JavascriptInterface | ||
| public void loadWithUSB() { | ||
| Log.d(TAG, "loadWithUSB called!"); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,6 +4,7 @@ | |
| import time | ||
|
|
||
| import initialization # noqa: F401 keep this first, to ensure we're set up for other imports | ||
| from android.runnable import run_on_ui_thread | ||
| from android_utils import ask_all_files_access | ||
| from android_utils import get_endless_key_paths | ||
| from android_utils import provision_endless_key_database | ||
|
|
@@ -87,22 +88,40 @@ def _enable_kolibri_plugin(plugin_name: str, optional=False) -> bool: | |
| except FileNotFoundError: | ||
| pass | ||
|
|
||
| # we need to initialize Kolibri to allow us to access the app key | ||
| initialize() | ||
|
|
||
| # start kolibri server | ||
| logging.info("Starting kolibri server via Android service...") | ||
| start_service("server") | ||
| def start_kolibri(): | ||
| # we need to initialize Kolibri to allow us to access the app key | ||
| initialize() | ||
|
|
||
| # Tie up this thread until the server is running | ||
| wait_for_status(STATUS_RUNNING, timeout=120) | ||
| # start kolibri server | ||
| logging.info("Starting kolibri server via Android service...") | ||
| start_service("server") | ||
|
|
||
| _, port, _, _ = _read_pid_file(PID_FILE) | ||
| # Tie up this thread until the server is running | ||
| wait_for_status(STATUS_RUNNING, timeout=120) | ||
|
|
||
| start_url = "http://127.0.0.1:{port}".format(port=port) + interface.get_initialize_url() | ||
| loadUrl(start_url) | ||
| _, port, _, _ = _read_pid_file(PID_FILE) | ||
|
|
||
| start_service("remoteshell") | ||
| start_url = ( | ||
| "http://127.0.0.1:{port}".format(port=port) + interface.get_initialize_url() | ||
| ) | ||
| loadUrl(start_url) | ||
|
|
||
| start_service("remoteshell") | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This bit (the |
||
|
|
||
|
|
||
| @run_on_ui_thread | ||
| def hook(): | ||
| WelcomeScreenInterface = autoclass("org.endlessos.Key.WelcomeScreenInterface") | ||
| welcomeScreenInterface = WelcomeScreenInterface() | ||
| welcomeScreenInterface.test() | ||
| PythonActivity.mWebView.addJavascriptInterface(welcomeScreenInterface, "EndlessAPI") | ||
| PythonActivity.mWebView.loadUrl( | ||
| "file:///android_asset/loadingScreen/index.html#/welcome" | ||
| ) | ||
|
|
||
|
|
||
| hook() | ||
|
|
||
| while True: | ||
| time.sleep(0.05) | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍 this was needed :)