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

Fix/android 31 missing flag #128

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions android/lib/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ android {
useLibrary 'org.apache.http.legacy'

compileSdkVersion 30
buildToolsVersion '30.0.2'
buildToolsVersion '31.0.0'

defaultConfig {
minSdkVersion 16
targetSdkVersion 30
targetSdkVersion 31
}

compileOptions {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ protected static void displayMessage(Context context, Bitmap picture, Map<String

Intent notificationIntent = new Intent(context, NotificationActivity.class);;
notificationIntent.putExtra("params", Extension.getParametersFromMessage(messageData));
PendingIntent contentIntent = PendingIntent.getActivity(context, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT);
PendingIntent contentIntent = PendingIntent.getActivity(context, 0, notificationIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);

boolean makeSquare = notificationIntent.getBooleanExtra("makeSquare", false);

Expand Down
Binary file modified bin/AirPushNotification.ane
Binary file not shown.
6 changes: 3 additions & 3 deletions build/build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</taskdef>

<!-- All -->
<target name="all" depends="ios, macos, android, swc, package" description="Full build of extension"/>
<target name="all" depends="android, swc, package" description="Full build of extension"/>

<!-- iOS -->
<target name="ios" description="Build iOS Library">
Expand Down Expand Up @@ -255,8 +255,8 @@
<arg value="${name}.ane"/>
<arg value="../extension.xml"/>
<arg line="-swc swc/${name}.swc"/>
<arg line="-platform iPhone-ARM -platformoptions ../platform-ios.xml -C ios/ ."/>
<arg line="-platform MacOS-x86-64 -C macos/ . "/>
<!-- <arg line="-platform iPhone-ARM -platformoptions ../platform-ios.xml -C ios/ ."/> -->
<!-- <arg line="-platform MacOS-x86-64 -C macos/ . "/> -->
<arg line="-platform Android-ARM -platformoptions ../platform-android.xml -C android/ ."/>
<arg line="-platform Android-ARM64 -platformoptions ../platform-android.xml -C android/ ."/>
<arg line="-platform Android-x86 -platformoptions ../platform-android.xml -C android/ ."/>
Expand Down
4 changes: 2 additions & 2 deletions build/extension.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<versionNumber>2.0.0</versionNumber>
<platforms>

<platform name="iPhone-ARM">
<!-- <platform name="iPhone-ARM">
<applicationDeployment>
<nativeLibrary>libAirPushNotification.a</nativeLibrary>
<initializer>AirPushNotificationInitializer</initializer>
Expand All @@ -36,7 +36,7 @@
<finalizer>AirPushNotificationFinalizer</finalizer>
</applicationDeployment>
</platform>

-->
<platform name="Android-ARM">
<applicationDeployment>
<nativeLibrary>libAirPushNotification.jar</nativeLibrary>
Expand Down