Skip to content
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

Webview: Drop USB APIs relating to Welcome screen #175

Merged
merged 8 commits into from
Aug 16, 2023
Merged

Conversation

starnight
Copy link

Since the commit ("Welcome: Drop USB/SD option from Welcome screen") of kolibri-explore-plugin 1 drops the USB option, Endless Key app removes corresponding USB APIs accordingly.

Fixes: #171

Copy link
Member

@dbnicholson dbnicholson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. There's also all the kolibri_whitenoise hacking that becomes unnecessary after this, but we can do that as a followup. I did a quick test run and it got to the download page.

I think you can delete everything to do with android_utils.get_endless_key_uris, StartupState.USB_USER and KOLIBRI_CONTENT_FALLBACK_DIRS.

Since the commit ("Welcome: Drop USB/SD option from Welcome screen") of
kolibri-explore-plugin [1] drops the USB option, Endless Key app removes
corresponding USB APIs accordingly.

[1]: https://github.com/endlessm/kolibri-explore-plugin

Fixes: #171
This reverts commit 8e20365.

Drop Endless whitenoise hacking.

Fixes: #171
This reverts commit 90501bc.

Drop Endless whitenoise hacking.

Fixes: #171
This reverts commit 0d4a732.

Drop Endless whitenoise hacking.

Fixes: #171
This reverts commit f492b45.

Drop Endless whitenoise hacking.

Fixes: #171
This reverts commit 31216bf.

Drop Endless whitenoise hacking.

Fixes: #171
This reverts commit fa15325.

Drop Endless whitenoise hacking.

Fixes: #171
@starnight
Copy link
Author

Drop get_endless_key_uris, USB_USER and KOLIBRI_CONTENT_FALLBACK_DIRS. Also, remove the WhiteNoise in the new commits.

This reverts commit 7d3d57c. We no
longer need any DocumentsProvider support if we're not trying to access
a directory on a USB drive.
Copy link
Member

@dbnicholson dbnicholson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me and ran correctly in my testing. I added one more revert to completely remove the DocumentsProvider support. We don't have any more use for that. @dylanmccall wanted to take a look at this, so I'm adding him as a reviewer.

Copy link

@dylanmccall dylanmccall left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this all looks marvellous to me, too! I'll merge it :)

@dylanmccall dylanmccall merged commit 2d9d060 into develop Aug 16, 2023
5 checks passed
@starnight starnight deleted the drop-USB-API branch August 16, 2023 04:25
@starnight
Copy link
Author

Tested by the comment #171 (comment)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Stop using the welcome-screen USB APIs on Android
3 participants