mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-10 23:44:24 +00:00
Code Activity

Android: add putFloat to bundle and rename JavaBundle to AndroidBundle.

Browse source
This commit is contained in:
Lukasz Kozakiewicz 2018-11-04 19:33:53 +01:00
parent e19c673b4e
commit 21c2612dea
3 changed files with 100 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

51
modules/juce_core/native/juce_android_JNIHelpers.h
View file

@ -347,6 +347,32 @@ DECLARE_JNI_CLASS (AndroidBitmapConfig, "android/graphics/Bitmap$Config");
DECLARE_JNI_CLASS (AndroidBitmapFactory, "android/graphics/BitmapFactory"); DECLARE_JNI_CLASS (AndroidBitmapFactory, "android/graphics/BitmapFactory");
#undef JNI_CLASS_MEMBERS #undef JNI_CLASS_MEMBERS
#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD) \
METHOD (constructor, "<init>", "()V") \
METHOD (containsKey, "containsKey", "(Ljava/lang/String;)Z") \
METHOD (get, "get", "(Ljava/lang/String;)Ljava/lang/Object;") \
METHOD (getBoolean, "getBoolean", "(Ljava/lang/String;)Z") \
METHOD (getBundle, "getBundle", "(Ljava/lang/String;)Landroid/os/Bundle;") \
METHOD (getCharSequence, "getCharSequence", "(Ljava/lang/String;)Ljava/lang/CharSequence;") \
METHOD (getInt, "getInt", "(Ljava/lang/String;)I") \
METHOD (getLong, "getLong", "(Ljava/lang/String;)J") \
METHOD (getLongArray, "getLongArray", "(Ljava/lang/String;)[J") \
METHOD (getParcelable, "getParcelable", "(Ljava/lang/String;)Landroid/os/Parcelable;") \
METHOD (getString, "getString", "(Ljava/lang/String;)Ljava/lang/String;") \
METHOD (getStringArrayList, "getStringArrayList", "(Ljava/lang/String;)Ljava/util/ArrayList;") \
METHOD (keySet, "keySet", "()Ljava/util/Set;") \
METHOD (putBoolean, "putBoolean", "(Ljava/lang/String;Z)V") \
METHOD (putBundle, "putBundle", "(Ljava/lang/String;Landroid/os/Bundle;)V") \
METHOD (putFloat, "putFloat", "(Ljava/lang/String;F)V") \
METHOD (putInt, "putInt", "(Ljava/lang/String;I)V") \
METHOD (putLong, "putLong", "(Ljava/lang/String;J)V") \
METHOD (putLongArray, "putLongArray", "(Ljava/lang/String;[J)V") \
METHOD (putString, "putString", "(Ljava/lang/String;Ljava/lang/String;)V") \
METHOD (putStringArrayList, "putStringArrayList", "(Ljava/lang/String;Ljava/util/ArrayList;)V")
DECLARE_JNI_CLASS (AndroidBundle, "android/os/Bundle");
#undef JNI_CLASS_MEMBERS
#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD) \ #define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD) \
STATICMETHOD (dumpReferenceTables, "dumpReferenceTables", "()V") STATICMETHOD (dumpReferenceTables, "dumpReferenceTables", "()V")
@ -530,31 +556,6 @@ DECLARE_JNI_CLASS (JavaArrayList, "java/util/ArrayList");
DECLARE_JNI_CLASS (JavaBoolean, "java/lang/Boolean"); DECLARE_JNI_CLASS (JavaBoolean, "java/lang/Boolean");
#undef JNI_CLASS_MEMBERS #undef JNI_CLASS_MEMBERS
#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD) \
METHOD (constructor, "<init>", "()V") \
METHOD (containsKey, "containsKey", "(Ljava/lang/String;)Z") \
METHOD (get, "get", "(Ljava/lang/String;)Ljava/lang/Object;") \
METHOD (getBoolean, "getBoolean", "(Ljava/lang/String;)Z") \
METHOD (getBundle, "getBundle", "(Ljava/lang/String;)Landroid/os/Bundle;") \
METHOD (getCharSequence, "getCharSequence", "(Ljava/lang/String;)Ljava/lang/CharSequence;") \
METHOD (getInt, "getInt", "(Ljava/lang/String;)I") \
METHOD (getLong, "getLong", "(Ljava/lang/String;)J") \
METHOD (getLongArray, "getLongArray", "(Ljava/lang/String;)[J") \
METHOD (getParcelable, "getParcelable", "(Ljava/lang/String;)Landroid/os/Parcelable;") \
METHOD (getString, "getString", "(Ljava/lang/String;)Ljava/lang/String;") \
METHOD (getStringArrayList, "getStringArrayList", "(Ljava/lang/String;)Ljava/util/ArrayList;") \
METHOD (keySet, "keySet", "()Ljava/util/Set;") \
METHOD (putBoolean, "putBoolean", "(Ljava/lang/String;Z)V") \
METHOD (putBundle, "putBundle", "(Ljava/lang/String;Landroid/os/Bundle;)V") \
METHOD (putInt, "putInt", "(Ljava/lang/String;I)V") \
METHOD (putLong, "putLong", "(Ljava/lang/String;J)V") \
METHOD (putLongArray, "putLongArray", "(Ljava/lang/String;[J)V") \
METHOD (putString, "putString", "(Ljava/lang/String;Ljava/lang/String;)V") \
METHOD (putStringArrayList, "putStringArrayList", "(Ljava/lang/String;Ljava/util/ArrayList;)V")
DECLARE_JNI_CLASS (JavaBundle, "android/os/Bundle");
#undef JNI_CLASS_MEMBERS
#define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD) \ #define JNI_CLASS_MEMBERS(METHOD, STATICMETHOD, FIELD, STATICFIELD) \
METHOD (get, "get", "([B)Ljava/nio/ByteBuffer;") \ METHOD (get, "get", "([B)Ljava/nio/ByteBuffer;") \
METHOD (remaining, "remaining", "()I") METHOD (remaining, "remaining", "()I")

114
modules/juce_gui_extra/native/juce_android_PushNotifications.cpp
View file

@ -419,7 +419,7 @@ struct PushNotifications::Pimpl
if (remoteInputResult.get() != 0) if (remoteInputResult.get() != 0)
{ {
auto charSequence = LocalRef<jobject> (env->CallObjectMethod (remoteInputResult, JavaBundle.getCharSequence, resultKeyString.get())); auto charSequence = LocalRef<jobject> (env->CallObjectMethod (remoteInputResult, AndroidBundle.getCharSequence, resultKeyString.get()));
auto responseStringRef = LocalRef<jstring> ((jstring) env->CallObjectMethod (charSequence, JavaCharSequence.toString)); auto responseStringRef = LocalRef<jstring> ((jstring) env->CallObjectMethod (charSequence, JavaCharSequence.toString));
responseString = juceString (responseStringRef.get()); responseString = juceString (responseStringRef.get());
} }
@ -741,40 +741,40 @@ struct PushNotifications::Pimpl
{ {
auto* env = getEnv(); auto* env = getEnv();
auto bundle = LocalRef<jobject> (env->NewObject (JavaBundle, JavaBundle.constructor)); auto bundle = LocalRef<jobject> (env->NewObject (AndroidBundle, AndroidBundle.constructor));
env->CallVoidMethod (bundle, JavaBundle.putString, javaString ("identifier") .get(), javaString (n.identifier).get()); env->CallVoidMethod (bundle, AndroidBundle.putString, javaString ("identifier") .get(), javaString (n.identifier).get());
env->CallVoidMethod (bundle, JavaBundle.putString, javaString ("title") .get(), javaString (n.title).get()); env->CallVoidMethod (bundle, AndroidBundle.putString, javaString ("title") .get(), javaString (n.title).get());
env->CallVoidMethod (bundle, JavaBundle.putString, javaString ("body") .get(), javaString (n.body).get()); env->CallVoidMethod (bundle, AndroidBundle.putString, javaString ("body") .get(), javaString (n.body).get());
env->CallVoidMethod (bundle, JavaBundle.putString, javaString ("subtitle") .get(), javaString (n.subtitle).get()); env->CallVoidMethod (bundle, AndroidBundle.putString, javaString ("subtitle") .get(), javaString (n.subtitle).get());
env->CallVoidMethod (bundle, JavaBundle.putInt, javaString ("badgeNumber") .get(), n.badgeNumber); env->CallVoidMethod (bundle, AndroidBundle.putInt, javaString ("badgeNumber") .get(), n.badgeNumber);
env->CallVoidMethod (bundle, JavaBundle.putString, javaString ("soundToPlay") .get(), javaString (n.soundToPlay.toString (true)).get()); env->CallVoidMethod (bundle, AndroidBundle.putString, javaString ("soundToPlay") .get(), javaString (n.soundToPlay.toString (true)).get());
env->CallVoidMethod (bundle, JavaBundle.putBundle, javaString ("properties") .get(), varToBundleWithPropertiesString (n.properties).get()); env->CallVoidMethod (bundle, AndroidBundle.putBundle, javaString ("properties") .get(), varToBundleWithPropertiesString (n.properties).get());
env->CallVoidMethod (bundle, JavaBundle.putString, javaString ("icon") .get(), javaString (n.icon).get()); env->CallVoidMethod (bundle, AndroidBundle.putString, javaString ("icon") .get(), javaString (n.icon).get());
env->CallVoidMethod (bundle, JavaBundle.putString, javaString ("channelId") .get(), javaString (n.channelId).get()); env->CallVoidMethod (bundle, AndroidBundle.putString, javaString ("channelId") .get(), javaString (n.channelId).get());
env->CallVoidMethod (bundle, JavaBundle.putString, javaString ("tickerText") .get(), javaString (n.tickerText).get()); env->CallVoidMethod (bundle, AndroidBundle.putString, javaString ("tickerText") .get(), javaString (n.tickerText).get());
env->CallVoidMethod (bundle, JavaBundle.putInt, javaString ("progressMax") .get(), n.progress.max); env->CallVoidMethod (bundle, AndroidBundle.putInt, javaString ("progressMax") .get(), n.progress.max);
env->CallVoidMethod (bundle, JavaBundle.putInt, javaString ("progressCurrent") .get(), n.progress.current); env->CallVoidMethod (bundle, AndroidBundle.putInt, javaString ("progressCurrent") .get(), n.progress.current);
env->CallVoidMethod (bundle, JavaBundle.putBoolean, javaString ("progressIndeterminate") .get(), n.progress.indeterminate); env->CallVoidMethod (bundle, AndroidBundle.putBoolean, javaString ("progressIndeterminate") .get(), n.progress.indeterminate);
env->CallVoidMethod (bundle, JavaBundle.putString, javaString ("person") .get(), javaString (n.person).get()); env->CallVoidMethod (bundle, AndroidBundle.putString, javaString ("person") .get(), javaString (n.person).get());
env->CallVoidMethod (bundle, JavaBundle.putInt, javaString ("type") .get(), n.type); env->CallVoidMethod (bundle, AndroidBundle.putInt, javaString ("type") .get(), n.type);
env->CallVoidMethod (bundle, JavaBundle.putInt, javaString ("priority") .get(), n.priority); env->CallVoidMethod (bundle, AndroidBundle.putInt, javaString ("priority") .get(), n.priority);
env->CallVoidMethod (bundle, JavaBundle.putInt, javaString ("lockScreenAppearance") .get(), n.lockScreenAppearance); env->CallVoidMethod (bundle, AndroidBundle.putInt, javaString ("lockScreenAppearance") .get(), n.lockScreenAppearance);
env->CallVoidMethod (bundle, JavaBundle.putString, javaString ("groupId") .get(), javaString (n.groupId).get()); env->CallVoidMethod (bundle, AndroidBundle.putString, javaString ("groupId") .get(), javaString (n.groupId).get());
env->CallVoidMethod (bundle, JavaBundle.putString, javaString ("groupSortKey") .get(), javaString (n.groupSortKey).get()); env->CallVoidMethod (bundle, AndroidBundle.putString, javaString ("groupSortKey") .get(), javaString (n.groupSortKey).get());
env->CallVoidMethod (bundle, JavaBundle.putBoolean, javaString ("groupSummary") .get(), n.groupSummary); env->CallVoidMethod (bundle, AndroidBundle.putBoolean, javaString ("groupSummary") .get(), n.groupSummary);
env->CallVoidMethod (bundle, JavaBundle.putInt, javaString ("accentColour") .get(), n.accentColour.getARGB()); env->CallVoidMethod (bundle, AndroidBundle.putInt, javaString ("accentColour") .get(), n.accentColour.getARGB());
env->CallVoidMethod (bundle, JavaBundle.putInt, javaString ("ledColour") .get(), n.ledColour.getARGB()); env->CallVoidMethod (bundle, AndroidBundle.putInt, javaString ("ledColour") .get(), n.ledColour.getARGB());
env->CallVoidMethod (bundle, JavaBundle.putInt, javaString ("ledBlinkPatternMsToBeOn") .get(), n.ledBlinkPattern.msToBeOn); env->CallVoidMethod (bundle, AndroidBundle.putInt, javaString ("ledBlinkPatternMsToBeOn") .get(), n.ledBlinkPattern.msToBeOn);
env->CallVoidMethod (bundle, JavaBundle.putInt, javaString ("ledBlinkPatternMsToBeOff").get(), n.ledBlinkPattern.msToBeOff); env->CallVoidMethod (bundle, AndroidBundle.putInt, javaString ("ledBlinkPatternMsToBeOff").get(), n.ledBlinkPattern.msToBeOff);
env->CallVoidMethod (bundle, JavaBundle.putBoolean, javaString ("shouldAutoCancel") .get(), n.shouldAutoCancel); env->CallVoidMethod (bundle, AndroidBundle.putBoolean, javaString ("shouldAutoCancel") .get(), n.shouldAutoCancel);
env->CallVoidMethod (bundle, JavaBundle.putBoolean, javaString ("localOnly") .get(), n.localOnly); env->CallVoidMethod (bundle, AndroidBundle.putBoolean, javaString ("localOnly") .get(), n.localOnly);
env->CallVoidMethod (bundle, JavaBundle.putBoolean, javaString ("ongoing") .get(), n.ongoing); env->CallVoidMethod (bundle, AndroidBundle.putBoolean, javaString ("ongoing") .get(), n.ongoing);
env->CallVoidMethod (bundle, JavaBundle.putBoolean, javaString ("alertOnlyOnce") .get(), n.alertOnlyOnce); env->CallVoidMethod (bundle, AndroidBundle.putBoolean, javaString ("alertOnlyOnce") .get(), n.alertOnlyOnce);
env->CallVoidMethod (bundle, JavaBundle.putInt, javaString ("timestampVisibility") .get(), n.timestampVisibility); env->CallVoidMethod (bundle, AndroidBundle.putInt, javaString ("timestampVisibility") .get(), n.timestampVisibility);
env->CallVoidMethod (bundle, JavaBundle.putInt, javaString ("badgeIconType") .get(), n.badgeIconType); env->CallVoidMethod (bundle, AndroidBundle.putInt, javaString ("badgeIconType") .get(), n.badgeIconType);
env->CallVoidMethod (bundle, JavaBundle.putInt, javaString ("groupAlertBehaviour") .get(), n.groupAlertBehaviour); env->CallVoidMethod (bundle, AndroidBundle.putInt, javaString ("groupAlertBehaviour") .get(), n.groupAlertBehaviour);
env->CallVoidMethod (bundle, JavaBundle.putLong, javaString ("timeoutAfterMs") .get(), (jlong)n.timeoutAfterMs); env->CallVoidMethod (bundle, AndroidBundle.putLong, javaString ("timeoutAfterMs") .get(), (jlong)n.timeoutAfterMs);
const int size = n.vibrationPattern.size(); const int size = n.vibrationPattern.size();
@ -788,7 +788,7 @@ struct PushNotifications::Pimpl
elements[i] = (jlong) n.vibrationPattern[i]; elements[i] = (jlong) n.vibrationPattern[i];
env->SetLongArrayRegion (array, 0, size, elements); env->SetLongArrayRegion (array, 0, size, elements);
env->CallVoidMethod (bundle, JavaBundle.putLongArray, javaString ("vibrationPattern").get(), array.get()); env->CallVoidMethod (bundle, AndroidBundle.putLongArray, javaString ("vibrationPattern").get(), array.get());
} }
return bundle; return bundle;
@ -881,9 +881,9 @@ struct PushNotifications::Pimpl
env->CallObjectMethod (notificationBuilder, NotificationBuilderApi20.setLocalOnly, n.localOnly); env->CallObjectMethod (notificationBuilder, NotificationBuilderApi20.setLocalOnly, n.localOnly);
auto extras = LocalRef<jobject> (env->NewObject (JavaBundle, JavaBundle.constructor)); auto extras = LocalRef<jobject> (env->NewObject (AndroidBundle, AndroidBundle.constructor));
env->CallVoidMethod (extras, JavaBundle.putBundle, javaString ("notificationData").get(), env->CallVoidMethod (extras, AndroidBundle.putBundle, javaString ("notificationData").get(),
juceNotificationToBundle (n).get()); juceNotificationToBundle (n).get());
env->CallObjectMethod (notificationBuilder, NotificationBuilderApi20.addExtras, extras.get()); env->CallObjectMethod (notificationBuilder, NotificationBuilderApi20.addExtras, extras.get());
@ -1110,8 +1110,8 @@ struct PushNotifications::Pimpl
{ {
auto* env = getEnv(); auto* env = getEnv();
auto bundle = LocalRef<jobject> (env->NewObject (JavaBundle, JavaBundle.constructor)); auto bundle = LocalRef<jobject> (env->NewObject (AndroidBundle, AndroidBundle.constructor));
env->CallVoidMethod (bundle, JavaBundle.putString, javaString ("properties").get(), env->CallVoidMethod (bundle, AndroidBundle.putString, javaString ("properties").get(),
javaString (JSON::toString (varToParse, false)).get()); javaString (JSON::toString (varToParse, false)).get());
return bundle; return bundle;
@ -1122,7 +1122,7 @@ struct PushNotifications::Pimpl
{ {
auto* env = getEnv(); auto* env = getEnv();
auto varString = LocalRef<jstring> ((jstring)env->CallObjectMethod (bundle, JavaBundle.getString, auto varString = LocalRef<jstring> ((jstring)env->CallObjectMethod (bundle, AndroidBundle.getString,
javaString ("properties").get())); javaString ("properties").get()));
var resultVar; var resultVar;
@ -1192,9 +1192,9 @@ struct PushNotifications::Pimpl
{ {
auto keyString = javaString (key); auto keyString = javaString (key);
if (env->CallBooleanMethod (bundle, JavaBundle.containsKey, keyString.get())) if (env->CallBooleanMethod (bundle, AndroidBundle.containsKey, keyString.get()))
{ {
auto value = LocalRef<jstring> ((jstring)env->CallObjectMethod (bundle, JavaBundle.getString, keyString.get())); auto value = LocalRef<jstring> ((jstring)env->CallObjectMethod (bundle, AndroidBundle.getString, keyString.get()));
return juceString (value); return juceString (value);
} }
@ -1205,8 +1205,8 @@ struct PushNotifications::Pimpl
{ {
auto keyString = javaString (key); auto keyString = javaString (key);
if (env->CallBooleanMethod (bundle, JavaBundle.containsKey, keyString.get())) if (env->CallBooleanMethod (bundle, AndroidBundle.containsKey, keyString.get()))
return env->CallIntMethod (bundle, JavaBundle.getInt, keyString.get()); return env->CallIntMethod (bundle, AndroidBundle.getInt, keyString.get());
return 0; return 0;
} }
@ -1216,8 +1216,8 @@ struct PushNotifications::Pimpl
{ {
auto keyString = javaString (key); auto keyString = javaString (key);
if (env->CallBooleanMethod (bundle, JavaBundle.containsKey, keyString.get())) if (env->CallBooleanMethod (bundle, AndroidBundle.containsKey, keyString.get()))
return (int) env->CallLongMethod (bundle, JavaBundle.getLong, keyString.get()); return (int) env->CallLongMethod (bundle, AndroidBundle.getLong, keyString.get());
return 0; return 0;
} }
@ -1226,9 +1226,9 @@ struct PushNotifications::Pimpl
{ {
auto keyString = javaString (key); auto keyString = javaString (key);
if (env->CallBooleanMethod (bundle, JavaBundle.containsKey, keyString.get())) if (env->CallBooleanMethod (bundle, AndroidBundle.containsKey, keyString.get()))
{ {
auto value = LocalRef<jobject> (env->CallObjectMethod (bundle, JavaBundle.getBundle, keyString.get())); auto value = LocalRef<jobject> (env->CallObjectMethod (bundle, AndroidBundle.getBundle, keyString.get()));
return bundleWithPropertiesStringToVar (value); return bundleWithPropertiesStringToVar (value);
} }
@ -1239,8 +1239,8 @@ struct PushNotifications::Pimpl
{ {
auto keyString = javaString (key); auto keyString = javaString (key);
if (env->CallBooleanMethod (bundle, JavaBundle.containsKey, keyString.get())) if (env->CallBooleanMethod (bundle, AndroidBundle.containsKey, keyString.get()))
return env->CallBooleanMethod (bundle, JavaBundle.getBoolean, keyString.get()); return env->CallBooleanMethod (bundle, AndroidBundle.getBoolean, keyString.get());
return false; return false;
} }
@ -1249,9 +1249,9 @@ struct PushNotifications::Pimpl
{ {
auto keyString = javaString (key); auto keyString = javaString (key);
if (env->CallBooleanMethod (bundle, JavaBundle.containsKey, keyString.get())) if (env->CallBooleanMethod (bundle, AndroidBundle.containsKey, keyString.get()))
{ {
auto array = LocalRef<jlongArray> ((jlongArray) env->CallObjectMethod (bundle, JavaBundle.getLongArray, keyString.get())); auto array = LocalRef<jlongArray> ((jlongArray) env->CallObjectMethod (bundle, AndroidBundle.getLongArray, keyString.get()));
const int size = env->GetArrayLength (array.get()); const int size = env->GetArrayLength (array.get());
@ -1274,7 +1274,7 @@ struct PushNotifications::Pimpl
auto* env = getEnv(); auto* env = getEnv();
auto extras = LocalRef<jobject> (env->GetObjectField (notification, AndroidNotification.extras)); auto extras = LocalRef<jobject> (env->GetObjectField (notification, AndroidNotification.extras));
auto notificationData = LocalRef<jobject> (env->CallObjectMethod (extras, JavaBundle.getBundle, auto notificationData = LocalRef<jobject> (env->CallObjectMethod (extras, AndroidBundle.getBundle,
javaString ("notificationData").get())); javaString ("notificationData").get()));
if (notificationData.get() != nullptr) if (notificationData.get() != nullptr)
@ -1302,7 +1302,7 @@ struct PushNotifications::Pimpl
{ {
auto* env = getEnv(); auto* env = getEnv();
auto keySet = LocalRef<jobject> (env->CallObjectMethod (bundle, JavaBundle.keySet)); auto keySet = LocalRef<jobject> (env->CallObjectMethod (bundle, AndroidBundle.keySet));
auto iterator = LocalRef<jobject> (env->CallObjectMethod (keySet, JavaSet.iterator)); auto iterator = LocalRef<jobject> (env->CallObjectMethod (keySet, JavaSet.iterator));
DynamicObject::Ptr dynamicObject = new DynamicObject(); DynamicObject::Ptr dynamicObject = new DynamicObject();
@ -1313,7 +1313,7 @@ struct PushNotifications::Pimpl
break; break;
auto key = LocalRef<jstring> ((jstring) env->CallObjectMethod (iterator, JavaIterator.next)); auto key = LocalRef<jstring> ((jstring) env->CallObjectMethod (iterator, JavaIterator.next));
auto object = LocalRef<jobject> (env->CallObjectMethod (bundle, JavaBundle.get, key.get())); auto object = LocalRef<jobject> (env->CallObjectMethod (bundle, AndroidBundle.get, key.get()));
if (object.get() != nullptr) if (object.get() != nullptr)
{ {
@ -1566,8 +1566,8 @@ struct PushNotifications::Pimpl
if (extras == 0) if (extras == 0)
return false; return false;
return env->CallBooleanMethod (extras, JavaBundle.containsKey, javaString ("google.sent_time").get()) return env->CallBooleanMethod (extras, AndroidBundle.containsKey, javaString ("google.sent_time").get())
&& env->CallBooleanMethod (extras, JavaBundle.containsKey, javaString ("google.message_id").get()); && env->CallBooleanMethod (extras, AndroidBundle.containsKey, javaString ("google.message_id").get());
} }
PushNotifications& owner; PushNotifications& owner;

34
modules/juce_product_unlocking/native/juce_android_InAppPurchases.cpp
View file

@ -130,12 +130,12 @@ struct InAppPurchases::Pimpl : private AsyncUpdater,
auto* env = getEnv(); auto* env = getEnv();
auto responseCodeString = javaString ("RESPONSE_CODE"); auto responseCodeString = javaString ("RESPONSE_CODE");
auto responseCode = env->CallIntMethod (buyIntentBundle.get(), JavaBundle.getInt, responseCodeString.get()); auto responseCode = env->CallIntMethod (buyIntentBundle.get(), AndroidBundle.getInt, responseCodeString.get());
if (responseCode == 0) if (responseCode == 0)
{ {
auto buyIntentString = javaString ("BUY_INTENT"); auto buyIntentString = javaString ("BUY_INTENT");
auto pendingIntent = LocalRef<jobject> (env->CallObjectMethod (buyIntentBundle.get(), JavaBundle.getParcelable, buyIntentString.get())); auto pendingIntent = LocalRef<jobject> (env->CallObjectMethod (buyIntentBundle.get(), AndroidBundle.getParcelable, buyIntentString.get()));
auto requestCode = 1001; auto requestCode = 1001;
auto intentSender = LocalRef<jobject> (env->CallObjectMethod (pendingIntent.get(), AndroidPendingIntent.getIntentSender)); auto intentSender = LocalRef<jobject> (env->CallObjectMethod (pendingIntent.get(), AndroidPendingIntent.getIntentSender));
@ -236,7 +236,7 @@ struct InAppPurchases::Pimpl : private AsyncUpdater,
for (const auto& identifier : subscriptionIdentifiers) for (const auto& identifier : subscriptionIdentifiers)
env->CallBooleanMethod (skuList.get(), JavaArrayList.add, javaString (identifier).get()); env->CallBooleanMethod (skuList.get(), JavaArrayList.add, javaString (identifier).get());
auto extraParams = LocalRef<jobject> (env->NewObject (JavaBundle, JavaBundle.constructor)); auto extraParams = LocalRef<jobject> (env->NewObject (AndroidBundle, AndroidBundle.constructor));
if (extraParams.get() == 0) if (extraParams.get() == 0)
{ {
@ -247,8 +247,8 @@ struct InAppPurchases::Pimpl : private AsyncUpdater,
auto skusToReplaceString = javaString ("skusToReplace"); auto skusToReplaceString = javaString ("skusToReplace");
auto replaceSkusProrationString = javaString ("replaceSkusProration"); auto replaceSkusProrationString = javaString ("replaceSkusProration");
env->CallVoidMethod (extraParams.get(), JavaBundle.putStringArrayList, skusToReplaceString.get(), skuList.get()); env->CallVoidMethod (extraParams.get(), AndroidBundle.putStringArrayList, skusToReplaceString.get(), skuList.get());
env->CallVoidMethod (extraParams.get(), JavaBundle.putBoolean, replaceSkusProrationString.get(), creditForUnusedSubscription); env->CallVoidMethod (extraParams.get(), AndroidBundle.putBoolean, replaceSkusProrationString.get(), creditForUnusedSubscription);
return LocalRef<jobject> (inAppBillingService.callObjectMethod (IInAppBillingService.getBuyIntentExtraParams, 6, return LocalRef<jobject> (inAppBillingService.callObjectMethod (IInAppBillingService.getBuyIntentExtraParams, 6,
getPackageName().get(), skuString.get(), getPackageName().get(), skuString.get(),
@ -399,14 +399,14 @@ struct InAppPurchases::Pimpl : private AsyncUpdater,
for (const auto& pi : productIdentifiersToQuery) for (const auto& pi : productIdentifiersToQuery)
env->CallBooleanMethod (skuList.get(), JavaArrayList.add, javaString (pi).get()); env->CallBooleanMethod (skuList.get(), JavaArrayList.add, javaString (pi).get());
auto querySkus = LocalRef<jobject> (env->NewObject (JavaBundle, JavaBundle.constructor)); auto querySkus = LocalRef<jobject> (env->NewObject (AndroidBundle, AndroidBundle.constructor));
if (querySkus.get() == 0) if (querySkus.get() == 0)
return LocalRef<jobject> (0); return LocalRef<jobject> (0);
auto itemIdListString = javaString ("ITEM_ID_LIST"); auto itemIdListString = javaString ("ITEM_ID_LIST");
env->CallVoidMethod (querySkus.get(), JavaBundle.putStringArrayList, itemIdListString.get(), skuList.get()); env->CallVoidMethod (querySkus.get(), AndroidBundle.putStringArrayList, itemIdListString.get(), skuList.get());
auto productTypeString = javaString (productType); auto productTypeString = javaString (productType);
@ -427,13 +427,13 @@ struct InAppPurchases::Pimpl : private AsyncUpdater,
auto responseCodeString = javaString ("RESPONSE_CODE"); auto responseCodeString = javaString ("RESPONSE_CODE");
auto responseCode = env->CallIntMethod (retrievedProducts.get(), JavaBundle.getInt, responseCodeString.get()); auto responseCode = env->CallIntMethod (retrievedProducts.get(), AndroidBundle.getInt, responseCodeString.get());
if (responseCode == 0) if (responseCode == 0)
{ {
auto detailsListString = javaString ("DETAILS_LIST"); auto detailsListString = javaString ("DETAILS_LIST");
auto responseList = LocalRef<jobject> (env->CallObjectMethod (retrievedProducts.get(), JavaBundle.getStringArrayList, auto responseList = LocalRef<jobject> (env->CallObjectMethod (retrievedProducts.get(), AndroidBundle.getStringArrayList,
detailsListString.get())); detailsListString.get()));
if (responseList != 0) if (responseList != 0)
@ -555,7 +555,7 @@ struct InAppPurchases::Pimpl : private AsyncUpdater,
if (ownedItems.get() != 0) if (ownedItems.get() != 0)
{ {
auto responseCodeString = javaString ("RESPONSE_CODE"); auto responseCodeString = javaString ("RESPONSE_CODE");
auto responseCode = env->CallIntMethod (ownedItems.get(), JavaBundle.getInt, responseCodeString.get()); auto responseCode = env->CallIntMethod (ownedItems.get(), AndroidBundle.getInt, responseCodeString.get());
if (responseCode == 0) if (responseCode == 0)
{ {
@ -564,10 +564,10 @@ struct InAppPurchases::Pimpl : private AsyncUpdater,
auto signatureListString = javaString ("INAPP_DATA_SIGNATURE_LIST"); auto signatureListString = javaString ("INAPP_DATA_SIGNATURE_LIST");
auto continuationTokenString = javaString ("INAPP_CONTINUATION_TOKEN"); auto continuationTokenString = javaString ("INAPP_CONTINUATION_TOKEN");
auto ownedSkus = LocalRef<jobject> (env->CallObjectMethod (ownedItems.get(), JavaBundle.getStringArrayList, itemListString.get())); auto ownedSkus = LocalRef<jobject> (env->CallObjectMethod (ownedItems.get(), AndroidBundle.getStringArrayList, itemListString.get()));
auto purchaseDataList = LocalRef<jobject> (env->CallObjectMethod (ownedItems.get(), JavaBundle.getStringArrayList, dataListString.get())); auto purchaseDataList = LocalRef<jobject> (env->CallObjectMethod (ownedItems.get(), AndroidBundle.getStringArrayList, dataListString.get()));
auto signatureList = LocalRef<jobject> (env->CallObjectMethod (ownedItems.get(), JavaBundle.getStringArrayList, signatureListString.get())); auto signatureList = LocalRef<jobject> (env->CallObjectMethod (ownedItems.get(), AndroidBundle.getStringArrayList, signatureListString.get()));
auto newContinuationToken = LocalRef<jstring> ((jstring) env->CallObjectMethod (ownedItems.get(), JavaBundle.getString, continuationTokenString.get())); auto newContinuationToken = LocalRef<jstring> ((jstring) env->CallObjectMethod (ownedItems.get(), AndroidBundle.getString, continuationTokenString.get()));
for (auto i = 0; i < env->CallIntMethod (purchaseDataList.get(), JavaArrayList.size); ++i) for (auto i = 0; i < env->CallIntMethod (purchaseDataList.get(), JavaArrayList.size); ++i)
{ {
@ -681,15 +681,15 @@ struct InAppPurchases::Pimpl : private AsyncUpdater,
auto* env = getEnv(); auto* env = getEnv();
auto responseCodeString = javaString ("RESPONSE_CODE"); auto responseCodeString = javaString ("RESPONSE_CODE");
auto responseCode = env->CallIntMethod (ownedItems.get(), JavaBundle.getInt, responseCodeString.get()); auto responseCode = env->CallIntMethod (ownedItems.get(), AndroidBundle.getInt, responseCodeString.get());
if (responseCode == 0) if (responseCode == 0)
{ {
auto dataListString = javaString ("INAPP_PURCHASE_DATA_LIST"); auto dataListString = javaString ("INAPP_PURCHASE_DATA_LIST");
auto continuationTokenString = javaString ("INAPP_CONTINUATION_TOKEN"); auto continuationTokenString = javaString ("INAPP_CONTINUATION_TOKEN");
auto purchaseDataList = LocalRef<jobject> (env->CallObjectMethod (ownedItems.get(), JavaBundle.getStringArrayList, dataListString.get())); auto purchaseDataList = LocalRef<jobject> (env->CallObjectMethod (ownedItems.get(), AndroidBundle.getStringArrayList, dataListString.get()));
auto newContinuationToken = LocalRef<jstring> ((jstring) env->CallObjectMethod (ownedItems.get(), JavaBundle.getString, continuationTokenString.get())); auto newContinuationToken = LocalRef<jstring> ((jstring) env->CallObjectMethod (ownedItems.get(), AndroidBundle.getString, continuationTokenString.get()));
for (auto i = 0; i < env->CallIntMethod (purchaseDataList.get(), JavaArrayList.size); ++i) for (auto i = 0; i < env->CallIntMethod (purchaseDataList.get(), JavaArrayList.size); ++i)
{ {