Skip to content

Commit 4028737

Browse files
jkasten2jkasten2
committed
Closed db and stream resources and misc clean up
* Fixed some classes were database connections, cursors, and http streams were not getting cleaned up. - Only detectable with StrictMode. * Added Unity target for its new AAR build. * Removed some old no longer used source files.
1 parent 664cfac commit 4028737

File tree

60 files changed

+156
-7675
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+156
-7675
lines changed

‎OneSignalSDK.jar

-4.75 KB
Binary file not shown.

‎OneSignalSDK/app/app.iml

Lines changed: 49 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,15 @@
99
<facet type="android" name="Android">
1010
<configuration>
1111
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12-
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
12+
<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="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
16-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
15+
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugUnitTest" />
16+
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugUnitTestSources" />
1717
<afterSyncTasks>
18-
<task>generateDebugAndroidTestSources</task>
1918
<task>generateDebugSources</task>
19+
<task>mockableAndroidJar</task>
20+
<task>prepareDebugUnitTestDependencies</task>
2021
</afterSyncTasks>
2122
<option name="ALLOW_USER_CONFIGURATION" value="false" />
2223
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -28,7 +29,7 @@
2829
</component>
2930
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
3031
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
31-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
32+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
3233
<exclude-output />
3334
<content url="file://$MODULE_DIR$">
3435
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
@@ -37,33 +38,34 @@
3738
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3839
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3940
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
40-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
41-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
42-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
43-
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
44-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
45-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4641
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4742
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4843
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4944
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
5045
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
5146
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5247
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
48+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
49+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
5355
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5456
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5557
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
5658
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
5759
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
5860
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
5961
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
60-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
61-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
62-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
63-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
64-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
65-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
66-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
62+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
63+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
64+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
65+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
66+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
67+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
68+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
6769
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
6870
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
6971
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
@@ -88,14 +90,40 @@
8890
</content>
8991
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
9092
<orderEntry type="sourceFolder" forTests="false" />
91-
<orderEntry type="library" exported="" name="play-services-maps-7.0.0" level="project" />
9293
<orderEntry type="library" exported="" name="play-services-base-7.0.0" level="project" />
93-
<orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
94-
<orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
94+
<orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
9595
<orderEntry type="library" exported="" name="play-services-location-7.0.0" level="project" />
96+
<orderEntry type="library" exported="" scope="TEST" name="shadows-core-3.1-SNAPSHOT" level="project" />
97+
<orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-3.1-SNAPSHOT" level="project" />
98+
<orderEntry type="library" exported="" scope="TEST" name="robolectric-utils-3.1-SNAPSHOT" level="project" />
99+
<orderEntry type="library" exported="" scope="TEST" name="xpp3_min-1.1.4c" level="project" />
100+
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-library-1.3" level="project" />
101+
<orderEntry type="library" exported="" scope="TEST" name="protobuf-java-2.6.1" level="project" />
102+
<orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
103+
<orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
96104
<orderEntry type="library" exported="" name="play-services-gcm-7.0.0" level="project" />
105+
<orderEntry type="library" exported="" scope="TEST" name="robolectric-3.1-SNAPSHOT" level="project" />
106+
<orderEntry type="library" exported="" scope="TEST" name="accessibility-test-framework-2.1" level="project" />
107+
<orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk16-1.46" level="project" />
108+
<orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
109+
<orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
110+
<orderEntry type="library" exported="" scope="TEST" name="xmlpull-1.1.3.1" level="project" />
111+
<orderEntry type="library" exported="" name="play-services-maps-7.0.0" level="project" />
112+
<orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
113+
<orderEntry type="library" exported="" scope="TEST" name="robolectric-resources-3.1-SNAPSHOT" level="project" />
114+
<orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
115+
<orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
97116
<orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
117+
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
118+
<orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
119+
<orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
98120
<orderEntry type="library" exported="" name="play-services-analytics-7.0.0" level="project" />
121+
<orderEntry type="library" exported="" scope="TEST" name="xstream-1.4.8" level="project" />
122+
<orderEntry type="library" exported="" scope="TEST" name="icu4j-53.1" level="project" />
123+
<orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
124+
<orderEntry type="library" exported="" scope="TEST" name="junit-4.8.2" level="project" />
125+
<orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />
126+
<orderEntry type="library" exported="" scope="TEST" name="guava-19.0-rc2" level="project" />
99127
<orderEntry type="module" module-name="onesignal" exported="" />
100128
</component>
101129
</module>

‎OneSignalSDK/app/src/main/java/com/onesignal/example/MainActivity2Activity.java

Lines changed: 0 additions & 114 deletions
This file was deleted.

‎OneSignalSDK/app/src/main/java/com/onesignal/example/OneSignalExampleApp.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.onesignal.example;
22

33
import android.app.Application;
4+
import android.os.StrictMode;
45

56
import com.onesignal.OneSignal;
67

@@ -9,6 +10,10 @@ public class OneSignalExampleApp extends Application {
910
@Override
1011
public void onCreate() {
1112
super.onCreate();
13+
14+
StrictMode.setThreadPolicy(new StrictMode.ThreadPolicy.Builder().detectAll().build());
15+
StrictMode.setVmPolicy(new StrictMode.VmPolicy.Builder().detectAll().build());
16+
1217
OneSignal.setLogLevel(OneSignal.LOG_LEVEL.DEBUG, OneSignal.LOG_LEVEL.NONE);
1318
OneSignal.startInit(this)
1419
.setAutoPromptLocation(true)

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public static void interruptHTTPDelay() {
5252
}
5353

5454
static void safeInterrupt() {
55-
if (testThread.getState() == Thread.State.TIMED_WAITING)
55+
if (testThread != null && testThread.getState() == Thread.State.TIMED_WAITING)
5656
testThread.interrupt();
5757
}
5858

@@ -98,7 +98,6 @@ static void putSync(String url, JSONObject jsonBody, OneSignalRestClient.Respons
9898
lastPost = jsonBody;
9999

100100
System.out.println("lastPost:jsonBody: " + lastPost.toString());
101-
System.out.println("testThread.getState()" + testThread.getState());
102101

103102
doInterruptibleDelay();
104103
if (doFail(responseHandler)) return;
@@ -116,7 +115,6 @@ static void put(String url, JSONObject jsonBody, OneSignalRestClient.ResponseHan
116115
if (doFail(responseHandler)) return;
117116

118117
System.out.println("lastPost:jsonBody: " + lastPost.toString());
119-
System.out.println("testThread.getState()" + testThread.getState());
120118

121119
responseHandler.onSuccess("{}");
122120

‎OneSignalSDK/app/src/test/java/com/onesignal/example/TestOneSignalExampleApp.java

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package com.onesignal.example;
2+
3+
import org.robolectric.TestLifecycleApplication;
4+
5+
import java.lang.reflect.Method;
6+
7+
8+
public class TestOneSignalExampleApp extends OneSignalExampleApp implements TestLifecycleApplication {
9+
10+
@Override
11+
public void onCreate() {
12+
// Override our normal OneSignalExampleApp onCreate so it does not interfere with our tests.
13+
}
14+
15+
@Override
16+
public void beforeTest(Method method) {
17+
}
18+
19+
@Override
20+
public void prepareTest(Object test) {
21+
}
22+
23+
@Override
24+
public void afterTest(Method method) {
25+
}
26+
}

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

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎OneSignalSDK/gradle/wrapper/gradle-wrapper.jar

-48.7 KB
Binary file not shown.

‎OneSignalSDK/onesignal/.idea/.name

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎OneSignalSDK/onesignal/.idea/compiler.xml

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)