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.

Sign up for GitHub

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: Allow passing activity meta-data #5

Merged
merged 1 commit into from
Jul 7, 2022
Merged

webview: Allow passing activity meta-data #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pythonforandroid/bootstraps/common/build/build.py
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,6 +682,8 @@ def parse_args_and_make_package(args=None):
help='The permissions to give this app.', nargs='+')
ap.add_argument('--meta-data', dest='meta_data', action='append', default=[],
help='Custom key=value to add in application metadata')
ap.add_argument('--activity-meta-data', dest='activity_meta_data', action='append', default=[],
help='Custom key=value to add in activity metadata')
ap.add_argument('--uses-library', dest='android_used_libs', action='append', default=[],
help='Used shared libraries included using <uses-library> tag in AndroidManifest.xml')
ap.add_argument('--asset', dest='assets',
Expand Down
2 changes: 2 additions & 0 deletions pythonforandroid/bootstraps/webview/build/templates/AndroidManifest.tmpl.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,8 @@
{%- if args.intent_filters -%}
{{- args.intent_filters -}}
{%- endif -%}
{% for m in args.activity_meta_data %}
Copy link
Member

Choose a reason for hiding this comment

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

Suffix the Jinja block with {%- and it will strip the whitespace before it. Then you can put the endif directive on a newline with the same and it will come out correctly. Although, the previous line should probably not do -%}.

<meta-data android:name="{{ m.split('=', 1)[0] }}" android:value="{{ m.split('=', 1)[-1] }}"/>{% endfor %}
Copy link
Member

Choose a reason for hiding this comment

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

It's nice to do this all in Jinja, but I would probably prefer to do this in build.py and substitute fully prepared statements.

Copy link
Author

Choose a reason for hiding this comment

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

Good points! I was just copying the for loop in this same template for the application meta-data. Do you think I should update those along the way? Or prefer inconsistency?

Copy link
Member

Choose a reason for hiding this comment

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

Oh, I skimmed the existing code too fast. I personally would like to clean up the old one, but upstream may feel different. I think I'd probably just leave the existing code alone.

</activity>

{% if service %}
Expand Down