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

Jump to bottom

chore(android): add "android:exported" to all activities/services with intent-filters #12881

Merged
merged 2 commits into from
Jul 30, 2021
Merged

chore(android): add "android:exported" to all activities/services with intent-filters #12881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dbfde4b
chore(android): add "android:exported" to all activities/services
jquick-axway Jun 11, 2021
4009589
Merge branch 'master' into TIMOB-28475
lokeshchdhry Jul 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

<application android:name=".TitaniumTestApplication" android:icon="@drawable/appicon" android:label="TitaniumTest" android:theme="@style/Theme.Titanium.App" android:usesCleartextTraffic="true">
<!-- The root Titanium splash activity which hosts the JS runtime. -->
<activity android:name=".TitaniumTestActivity" android:theme="@style/Theme.Titanium" android:alwaysRetainTaskState="true" android:configChanges="${tiActivityConfigChanges}">
<activity android:name=".TitaniumTestActivity" android:theme="@style/Theme.Titanium" android:exported="true" android:alwaysRetainTaskState="true" android:configChanges="${tiActivityConfigChanges}">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
Expand Down
1 change: 1 addition & 0 deletions android/templates/build/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
android:configChanges="${tiActivityConfigChanges}"
android:label="@string/app_name"
android:theme="@style/Theme.Titanium"
android:exported="true"
android:alwaysRetainTaskState="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
2 changes: 1 addition & 1 deletion android/templates/build/QuickService.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<service android:name="<%- serviceName %>" android:label="<%- label %>" android:icon="<%- icon %>" android:permission="android.permission.BIND_QUICK_SETTINGS_TILE">
<service android:name="<%- serviceName %>" android:label="<%- label %>" android:icon="<%- icon %>" android:permission="android.permission.BIND_QUICK_SETTINGS_TILE" android:exported="true">
<intent-filter>
<action android:name="android.service.quicksettings.action.QS_TILE"/>
</intent-filter>
Expand Down
8 changes: 7 additions & 1 deletion android/titanium/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,26 @@
<application>
<activity
android:name="org.appcelerator.titanium.TiActivity"
android:exported="false"
android:configChanges="${tiActivityConfigChanges}"/>
<activity
android:name="org.appcelerator.titanium.TiTranslucentActivity"
android:exported="false"
android:configChanges="${tiActivityConfigChanges}"
android:theme="@style/Theme.AppDerived.Translucent"/>
<activity
android:name="ti.modules.titanium.media.TiCameraActivity"
android:exported="false"
android:configChanges="${tiActivityConfigChanges}"
android:theme="@style/Theme.Titanium.Dark.Fullscreen"/>
<activity
android:name="ti.modules.titanium.media.TiVideoActivity"
android:exported="false"
android:configChanges="${tiActivityConfigChanges}"
android:theme="@style/Theme.AppDerived.Fullscreen"/>
<activity android:name="ti.modules.titanium.ui.android.TiPreferencesActivity"/>
<activity
android:name="ti.modules.titanium.ui.android.TiPreferencesActivity"
android:exported="false"/>

<provider
android:name="org.appcelerator.titanium.io.TiFileProvider"
Expand Down