Skip to content

Commit a17314d

Browse files
jkasten2jkasten2
committed
postNotification UTF-8 fix
* postNotification now works correctly with UTF-8 messages.
1 parent 5827264 commit a17314d

File tree

8 files changed

+73
-44
lines changed

8 files changed

+73
-44
lines changed

‎OneSignalSDK.jar‎

14 Bytes
Binary file not shown.

‎OneSignalSDK/.idea/misc.xml‎

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎OneSignalSDK/OneSignalExampleDev.iml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</configuration>
99
</facet>
1010
</component>
11-
<component name="NewModuleRootManager" inherit-compiler-output="true">
11+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
1212
<exclude-output />
1313
<content url="file://$MODULE_DIR$">
1414
<excludeFolder url="file://$MODULE_DIR$/.gradle" />

‎OneSignalSDK/app/app.iml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,13 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_unit_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
1615
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugUnitTest" />
1716
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugUnitTestSources" />
17+
<afterSyncTasks>
18+
<task>generateDebugSources</task>
19+
<task>mockableAndroidJar</task>
20+
<task>prepareDebugUnitTestDependencies</task>
21+
</afterSyncTasks>
1822
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1923
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
2024
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -23,7 +27,7 @@
2327
</configuration>
2428
</facet>
2529
</component>
26-
<component name="NewModuleRootManager" inherit-compiler-output="false">
30+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
2731
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
2832
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
2933
<exclude-output />
@@ -98,13 +102,13 @@
98102
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
99103
<orderEntry type="library" exported="" name="support-annotations-22.1.1" level="project" />
100104
<orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
101-
<orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
102105
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
106+
<orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
103107
<orderEntry type="library" exported="" name="appcompat-v7-22.1.1" level="project" />
104108
<orderEntry type="library" exported="" scope="TEST" name="icu4j-53.1" level="project" />
105109
<orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
106-
<orderEntry type="library" exported="" scope="TEST" name="accessibility-test-framework-1.0" level="project" />
107110
<orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
111+
<orderEntry type="library" exported="" scope="TEST" name="accessibility-test-framework-1.0" level="project" />
108112
<orderEntry type="library" exported="" scope="TEST" name="robolectric-3.0" level="project" />
109113
<orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk16-1.46" level="project" />
110114
<orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />

‎OneSignalSDK/onesignal/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ android {
1919

2020
dependencies {
2121
provided fileTree(dir: 'libs', include: ['*.jar'])
22-
compile 'com.google.android.gms:play-services-gcm:7.3.0'
23-
compile 'com.google.android.gms:play-services-ads:7.3.0'
22+
compile "com.google.android.gms:play-services-gcm:7.3.0"
23+
compile "com.google.android.gms:play-services-analytics:7.3.0"
2424
}
2525

2626
apply from: 'maven-push.gradle'

‎OneSignalSDK/onesignal/onesignal.iml‎

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,17 @@
88
</facet>
99
<facet type="android" name="Android">
1010
<configuration>
11-
<option name="SELECTED_BUILD_VARIANT" value="release" />
11+
<option name="SELECTED_BUILD_VARIANT" value="debug" />
1212
<option name="SELECTED_TEST_ARTIFACT" value="_unit_test_" />
13-
<option name="ASSEMBLE_TASK_NAME" value="assembleRelease" />
14-
<option name="COMPILE_JAVA_TASK_NAME" value="compileReleaseSources" />
15-
<option name="SOURCE_GEN_TASK_NAME" value="generateReleaseSources" />
16-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleReleaseUnitTest" />
17-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileReleaseUnitTestSources" />
13+
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
14+
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugUnitTest" />
16+
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugUnitTestSources" />
17+
<afterSyncTasks>
18+
<task>generateDebugSources</task>
19+
<task>mockableAndroidJar</task>
20+
<task>prepareDebugUnitTestDependencies</task>
21+
</afterSyncTasks>
1822
<option name="ALLOW_USER_CONFIGURATION" value="false" />
1923
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
2024
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -24,31 +28,31 @@
2428
</configuration>
2529
</facet>
2630
</component>
27-
<component name="NewModuleRootManager" inherit-compiler-output="false">
28-
<output url="file://$MODULE_DIR$/build/intermediates/classes/release" />
29-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/release" />
31+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
32+
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
33+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
3034
<exclude-output />
3135
<content url="file://$MODULE_DIR$">
32-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/release" isTestSource="false" generated="true" />
33-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/release" isTestSource="false" generated="true" />
34-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/release" isTestSource="false" generated="true" />
35-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/release" isTestSource="false" generated="true" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/release" type="java-resource" />
37-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/release" type="java-resource" />
38-
<sourceFolder url="file://$MODULE_DIR$/src/release/res" type="java-resource" />
39-
<sourceFolder url="file://$MODULE_DIR$/src/release/resources" type="java-resource" />
40-
<sourceFolder url="file://$MODULE_DIR$/src/release/assets" type="java-resource" />
41-
<sourceFolder url="file://$MODULE_DIR$/src/release/aidl" isTestSource="false" />
42-
<sourceFolder url="file://$MODULE_DIR$/src/release/java" isTestSource="false" />
43-
<sourceFolder url="file://$MODULE_DIR$/src/release/jni" isTestSource="false" />
44-
<sourceFolder url="file://$MODULE_DIR$/src/release/rs" isTestSource="false" />
45-
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/res" type="java-test-resource" />
46-
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/resources" type="java-test-resource" />
47-
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/assets" type="java-test-resource" />
48-
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/aidl" isTestSource="true" />
49-
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/java" isTestSource="true" />
50-
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/jni" isTestSource="true" />
51-
<sourceFolder url="file://$MODULE_DIR$/src/testRelease/rs" isTestSource="true" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
37+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
39+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
42+
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
43+
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
44+
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
45+
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
46+
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
47+
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
49+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
5256
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5357
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5458
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -71,7 +75,6 @@
7175
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
7276
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
7377
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.0.0/jars" />
74-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-ads/7.3.0/jars" />
7578
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-analytics/7.3.0/jars" />
7679
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-base/7.3.0/jars" />
7780
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.gms/play-services-gcm/7.3.0/jars" />
@@ -103,7 +106,6 @@
103106
<orderEntry type="library" exported="" name="amazon-device-messaging-1.0.1" level="project" />
104107
<orderEntry type="library" exported="" name="play-services-analytics-7.3.0" level="project" />
105108
<orderEntry type="library" exported="" name="play-services-base-7.3.0" level="project" />
106-
<orderEntry type="library" exported="" name="play-services-ads-7.3.0" level="project" />
107109
<orderEntry type="library" exported="" scope="TEST" name="mockable-android-22" level="project" />
108110
</component>
109111
</module>

‎OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignal.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ public interface PostNotificationResponseHandler {
141141
private static TrackGooglePurchase trackGooglePurchase;
142142
private static TrackAmazonPurchase trackAmazonPurchase;
143143

144-
public static final String VERSION = "011003";
144+
public static final String VERSION = "011004";
145145

146146
private static PushRegistrator pushRegistrator;
147147
private static AdvertisingIdentifierProvider mainAdIdProvider = new AdvertisingIdProviderGPS();

‎OneSignalSDK/onesignal/src/main/java/com/onesignal/OneSignalRestClient.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ class OneSignalRestClient {
5555
}
5656

5757
static void put(final Context context, final String url, JSONObject jsonBody, final ResponseHandlerInterface responseHandler) throws UnsupportedEncodingException {
58-
final StringEntity entity = new StringEntity(jsonBody.toString());
58+
final StringEntity entity = new StringEntity(jsonBody.toString(), "UTF-8");
5959

6060
new Thread(new Runnable() {
6161
public void run() {
@@ -65,8 +65,7 @@ public void run() {
6565
}
6666

6767
static void post(final Context context, final String url, JSONObject jsonBody, final ResponseHandlerInterface responseHandler) throws UnsupportedEncodingException {
68-
final StringEntity entity = new StringEntity(jsonBody.toString());
69-
68+
final StringEntity entity = new StringEntity(jsonBody.toString(), "UTF-8");
7069
new Thread(new Runnable() {
7170
public void run() {
7271
clientSync.post(context, BASE_URL + url, entity, "application/json", responseHandler);
@@ -83,12 +82,12 @@ public void run() {
8382
}
8483

8584
static void putSync(Context context, String url, JSONObject jsonBody, ResponseHandlerInterface responseHandler) throws UnsupportedEncodingException {
86-
StringEntity entity = new StringEntity(jsonBody.toString());
85+
StringEntity entity = new StringEntity(jsonBody.toString(), "UTF-8");
8786
clientSync.put(context, BASE_URL + url, entity, "application/json", responseHandler);
8887
}
8988

9089
static void postSync(Context context, String url, JSONObject jsonBody, ResponseHandlerInterface responseHandler) throws UnsupportedEncodingException {
91-
StringEntity entity = new StringEntity(jsonBody.toString());
90+
StringEntity entity = new StringEntity(jsonBody.toString(), "UTF-8");
9291
clientSync.post(context, BASE_URL + url, entity, "application/json", responseHandler);
9392
}
9493

0 commit comments

Comments
 (0)