Merge pull request #284 from jquick-axway/TIMOB-28479

chore(android): add "android:exported" to activities for Android 12
tidev · Sep 1, 2021 · d2eb10c · d2eb10c
2 parents 0fc3d6f + 5beaee5
commit d2eb10c
Show file tree

Hide file tree

Showing 4 changed files with 12,743 additions and 96 deletions.
diff --git a/android/manifest b/android/manifest
@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 5.0.2
+version: 6.0.1
 apiversion: 4
 architectures: arm64-v8a armeabi-v7a x86 x86_64
 description: Lets you process 1D/2D barcodes.

diff --git a/android/timodule.xml b/android/timodule.xml
@@ -4,6 +4,7 @@
         <manifest>
             <application>
                 <activity android:name="com.google.zxing.client.android.CaptureActivity"
+                          android:exported="false"
                           android:clearTaskOnLaunch="true"
                           android:stateNotNeeded="true"
                           android:screenOrientation="fullSensor"
@@ -49,6 +50,7 @@
                 </activity>
                 <activity android:name="com.google.zxing.client.android.encode.EncodeActivity"
                           android:label="@string/share_name"
+                          android:exported="false"
                           android:stateNotNeeded="true">
                     <intent-filter>
                         <action android:name="com.google.zxing.client.android.ENCODE"/>
@@ -69,6 +71,7 @@
                 </activity>
                 <activity android:name="com.google.zxing.client.android.book.SearchBookContentsActivity"
                           android:label="@string/sbc_name"
+                          android:exported="false"
                           android:stateNotNeeded="true"
                           android:screenOrientation="landscape"
                           android:configChanges="orientation|keyboardHidden">
@@ -79,6 +82,7 @@
                 </activity>
                 <activity android:name="com.google.zxing.client.android.share.ShareActivity"
                           android:label="@string/share_name"
+                          android:exported="false"
                           android:stateNotNeeded="true"
                           android:screenOrientation="user"
                           android:theme="@android:style/Theme.Light">
@@ -89,6 +93,7 @@
                 </activity>
                 <activity android:name="com.google.zxing.client.android.history.HistoryActivity"
                           android:label="@string/history_title"
+                          android:exported="false"
                           android:stateNotNeeded="true">
                     <intent-filter>
                         <action android:name="android.intent.action.VIEW"/>
@@ -97,6 +102,7 @@
                 </activity>
                 <activity android:name="com.google.zxing.client.android.share.BookmarkPickerActivity"
                           android:label="@string/bookmark_picker_name"
+                          android:exported="false"
                           android:stateNotNeeded="true">
                     <intent-filter>
                         <action android:name="android.intent.action.PICK"/>
@@ -105,6 +111,7 @@
                 </activity>
                 <activity android:name="com.google.zxing.client.android.share.AppPickerActivity"
                           android:label="@string/app_picker_name"
+                          android:exported="false"
                           android:stateNotNeeded="true"
                           android:configChanges="orientation">
                     <intent-filter>
@@ -113,6 +120,7 @@
                     </intent-filter>
                 </activity>
                 <activity android:name="com.google.zxing.client.android.HelpActivity"
+                          android:exported="false"
                           android:screenOrientation="user">
                     <intent-filter>
                         <action android:name="android.intent.action.VIEW"/>