Skip to content

Commit 73c8da0

Browse files
jkasten2jkasten2
committed
Fixed IAP tracking leak.
1 parent c0bf59d commit 73c8da0

File tree

9 files changed

+29
-23
lines changed

9 files changed

+29
-23
lines changed

‎OneSignalSDK/app/app.iml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3838
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3939
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
40-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
40+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
4141
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4242
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4343
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -73,8 +73,8 @@
7373
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7474
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
7575
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
76-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.1.1/jars" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.1.1/jars" />
76+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.0/jars" />
77+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.0/jars" />
7878
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
7979
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
8080
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
@@ -92,32 +92,32 @@
9292
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
9393
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9494
</content>
95-
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
95+
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
9696
<orderEntry type="sourceFolder" forTests="false" />
97+
<orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
9798
<orderEntry type="library" exported="" scope="TEST" name="shadows-core-3.0" level="project" />
9899
<orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
99100
<orderEntry type="library" exported="" scope="TEST" name="robolectric-utils-3.0" level="project" />
100101
<orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
101102
<orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
102103
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
103-
<orderEntry type="library" exported="" name="support-annotations-22.1.1" level="project" />
104104
<orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
105105
<orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
106106
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
107-
<orderEntry type="library" exported="" name="appcompat-v7-22.1.1" level="project" />
108107
<orderEntry type="library" exported="" scope="TEST" name="icu4j-53.1" level="project" />
109108
<orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
109+
<orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
110110
<orderEntry type="library" exported="" scope="TEST" name="accessibility-test-framework-1.0" level="project" />
111111
<orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
112112
<orderEntry type="library" exported="" scope="TEST" name="robolectric-3.0" level="project" />
113113
<orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk16-1.46" level="project" />
114114
<orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />
115115
<orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
116116
<orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
117-
<orderEntry type="library" exported="" name="support-v4-22.1.1" level="project" />
117+
<orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
118118
<orderEntry type="library" exported="" scope="TEST" name="robolectric-resources-3.0" level="project" />
119-
<orderEntry type="library" exported="" scope="TEST" name="mockable-android-22" level="project" />
120119
<orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-3.0" level="project" />
121120
<orderEntry type="module" module-name="onesignal" exported="" />
121+
<orderEntry type="library" exported="" name="org.apache.http.legacy-android-23" level="project" />
122122
</component>
123123
</module>

‎OneSignalSDK/app/build.gradle

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 22
5-
buildToolsVersion "22.0.1"
4+
compileSdkVersion 23
5+
buildToolsVersion "23.0.1"
6+
7+
useLibrary 'org.apache.http.legacy'
68

79
defaultConfig {
810
applicationId "com.onesignal.example"
911
manifestPlaceholders = [manifestApplicationId: "${applicationId}"]
1012
minSdkVersion 10
11-
targetSdkVersion 22
13+
targetSdkVersion 23
1214
versionCode 1
1315
versionName "1.0"
1416
}
@@ -28,7 +30,7 @@ android {
2830

2931
dependencies {
3032
compile fileTree(dir: 'libs', include: ['*.jar'])
31-
compile 'com.android.support:appcompat-v7:22.1.1'
33+
compile 'com.android.support:appcompat-v7:+'
3234

3335
// Use for SDK Development
3436
compile project(':onesignal')

‎OneSignalSDK/app/src/test/java/com/test/onesignal/MainOneSignalClassRunner.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import com.onesignal.NotificationBundleProcessor;
3838
import com.onesignal.OneSignal;
3939
import com.onesignal.ShadowOneSignalRestClient;
40+
import com.onesignal.ShadowPushRegistratorADM;
4041
import com.onesignal.ShadowPushRegistratorGPS;
4142
import com.onesignal.example.BlankActivity;
4243

@@ -57,7 +58,7 @@
5758

5859
@Config(packageName = "com.onesignal.example",
5960
constants = BuildConfig.class,
60-
shadows = {ShadowOneSignalRestClient.class, ShadowPushRegistratorGPS.class},
61+
shadows = {ShadowOneSignalRestClient.class, ShadowPushRegistratorGPS.class, ShadowPushRegistratorADM.class},
6162
sdk = 21)
6263
@RunWith(CustomRobolectricTestRunner.class)
6364
public class MainOneSignalClassRunner {

‎OneSignalSDK/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ buildscript {
55
jcenter()
66
}
77
dependencies {
8-
classpath 'com.android.tools.build:gradle:1.2.3'
8+
classpath 'com.android.tools.build:gradle:1.3.1'
99

1010
// NOTE: Do not place your application dependencies here; they belong
1111
// in the individual module build.gradle files

‎OneSignalSDK/onesignal/build.gradle

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 22
5-
buildToolsVersion "22.0.1"
4+
compileSdkVersion 23
5+
buildToolsVersion "23.0.1"
6+
7+
useLibrary 'org.apache.http.legacy'
68

79
defaultConfig {
810
minSdkVersion 10
9-
targetSdkVersion 21
11+
targetSdkVersion 23
1012
}
1113

1214
buildTypes {

‎OneSignalSDK/onesignal/onesignal.iml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3939
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
4040
<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" />
41+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
4242
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4343
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4444
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -97,7 +97,7 @@
9797
<excludeFolder url="file://$MODULE_DIR$/build/test-results" />
9898
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
9999
</content>
100-
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
100+
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
101101
<orderEntry type="sourceFolder" forTests="false" />
102102
<orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
103103
<orderEntry type="library" exported="" name="in-app-purchasing-2.0.1" level="project" />
@@ -106,6 +106,6 @@
106106
<orderEntry type="library" exported="" name="amazon-device-messaging-1.0.1" level="project" />
107107
<orderEntry type="library" exported="" name="play-services-analytics-7.3.0" level="project" />
108108
<orderEntry type="library" exported="" name="play-services-base-7.3.0" level="project" />
109-
<orderEntry type="library" exported="" scope="TEST" name="mockable-android-22" level="project" />
109+
<orderEntry type="library" exported="" name="org.apache.http.legacy-android-23" level="project" />
110110
</component>
111111
</module>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
import android.support.v4.app.NotificationManagerCompat;
6464
import android.text.SpannableString;
6565
import android.text.style.StyleSpan;
66-
import android.util.Log;
6766

6867
import com.onesignal.OneSignalDbContract.NotificationTable;
6968

‎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 = "011005";
144+
public static final String VERSION = "011006";
145145

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

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,9 @@ public void onServiceConnected(ComponentName name, IBinder service) {
130130

131131
Intent serviceIntent = new Intent("com.android.vending.billing.InAppBillingService.BIND");
132132
serviceIntent.setPackage("com.android.vending");
133-
appContext.bindService(serviceIntent, mServiceConn, Context.BIND_AUTO_CREATE);
133+
134+
Context applicationContext = appContext.getApplicationContext();
135+
applicationContext.bindService(serviceIntent, mServiceConn, Context.BIND_AUTO_CREATE);
134136
} else if (mIInAppBillingService != null)
135137
QueryBoughtItems();
136138
}

0 commit comments

Comments
 (0)