Skip to content

Commit 8f274cb

Browse files
HugoGresseHugoGresse
committed
Merge pull request #5 from teads/develop
mergin develop for v 1.3.2
2 parents f64b3e5 + 64033a3 commit 8f274cb

12 files changed

+110
-22
lines changed

‎README.md

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ repositories{
2828
}
2929
}
3030
dependencies {
31-
compile ('tv.teads.sdk:androidsdk:1.2.4@aar') {
31+
compile ('tv.teads.sdk:androidsdk:1.3.2@aar') {
3232
transitive = true;
3333
}
3434
}
@@ -39,6 +39,11 @@ dependencies {
3939
Integration instructions are available on the [wiki](https://github.com/teads/TeadsSDK-android/wiki).
4040

4141
## Changelog
42+
v1.3.2:
43+
- Fix for WebView inRead/inBoard scroll
44+
- External View to report ACTION_MOVE option
45+
- Replace RenderScript to use software solution
46+
- General fixes and improvments
4247

4348
v1.2.4:
4449
- Implement AdFactory

‎TeadsSDKDemo/app/app.iml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -82,17 +82,15 @@
8282
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8383
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
8484
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
85-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8685
</content>
8786
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
8887
<orderEntry type="sourceFolder" forTests="false" />
8988
<orderEntry type="library" exported="" name="play-services-plus-7.0.0" level="project" />
9089
<orderEntry type="library" exported="" name="okio-1.3.0" level="project" />
91-
<orderEntry type="library" exported="" name="jackson-databind-2.5.1" level="project" />
90+
<orderEntry type="library" exported="" name="jackson-databind-2.5.3" level="project" />
9291
<orderEntry type="library" exported="" name="play-services-base-7.0.0" level="project" />
9392
<orderEntry type="library" exported="" name="picasso-2.5.0" level="project" />
9493
<orderEntry type="library" exported="" name="play-services-panorama-7.0.0" level="project" />
95-
<orderEntry type="library" exported="" name="androidsdk-1.2.4" level="project" />
9694
<orderEntry type="library" exported="" name="play-services-safetynet-7.0.0" level="project" />
9795
<orderEntry type="library" exported="" name="play-services-location-7.0.0" level="project" />
9896
<orderEntry type="library" exported="" name="exoplayer-r1.3.3" level="project" />
@@ -106,20 +104,21 @@
106104
<orderEntry type="library" exported="" name="play-services-maps-7.0.0" level="project" />
107105
<orderEntry type="library" exported="" name="systembartint-1.0.3" level="project" />
108106
<orderEntry type="library" exported="" name="play-services-fitness-7.0.0" level="project" />
107+
<orderEntry type="library" exported="" name="androidsdk-1.3.2" level="project" />
108+
<orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
109109
<orderEntry type="library" exported="" name="play-services-identity-7.0.0" level="project" />
110110
<orderEntry type="library" exported="" name="play-services-ads-7.0.0" level="project" />
111-
<orderEntry type="library" exported="" name="support-annotations-22.1.0" level="project" />
111+
<orderEntry type="library" exported="" name="cardview-v7-22.2.0" level="project" />
112112
<orderEntry type="library" exported="" name="play-services-appstate-7.0.0" level="project" />
113113
<orderEntry type="library" exported="" name="okhttp-2.3.0" level="project" />
114114
<orderEntry type="library" exported="" name="android-async-http-1.4.6" level="project" />
115115
<orderEntry type="library" exported="" name="butterknife-6.1.0" level="project" />
116116
<orderEntry type="library" exported="" name="play-services-drive-7.0.0" level="project" />
117117
<orderEntry type="library" exported="" name="play-services-games-7.0.0" level="project" />
118118
<orderEntry type="library" exported="" name="play-services-analytics-7.0.0" level="project" />
119+
<orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
119120
<orderEntry type="library" exported="" name="play-services-nearby-7.0.0" level="project" />
120-
<orderEntry type="library" exported="" name="jackson-core-2.5.1" level="project" />
121-
<orderEntry type="library" exported="" name="support-v4-22.1.0" level="project" />
122-
<orderEntry type="library" exported="" name="cardview-v7-22.1.0" level="project" />
123-
<orderEntry type="library" exported="" name="appcompat-v7-22.1.0" level="project" />
121+
<orderEntry type="library" exported="" name="jackson-core-2.5.3" level="project" />
122+
<orderEntry type="library" exported="" name="appcompat-v7-22.2.0" level="project" />
124123
</component>
125124
</module>

‎TeadsSDKDemo/app/build.gradle

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,15 @@ android {
88
applicationId "tv.teads.teadssdkdemo"
99
minSdkVersion 16
1010
targetSdkVersion 22
11-
versionCode 7
12-
versionName "1.2.4"
11+
versionCode 8
12+
versionName "1.3.2"
1313
archivesBaseName = "teads-sdkdemo-" + versionName
1414
}
1515
buildTypes {
1616
release {
1717
minifyEnabled false
1818
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
19+
1920
}
2021
}
2122

@@ -33,13 +34,13 @@ repositories{
3334

3435
dependencies {
3536
compile fileTree(dir: 'libs', include: ['*.jar'])
36-
compile 'com.android.support:appcompat-v7:22.1.0'
37-
compile 'com.android.support:cardview-v7:22.1.0'
37+
compile 'com.android.support:appcompat-v7:22.2.0'
38+
compile 'com.android.support:cardview-v7:22.2.0'
3839
compile 'com.readystatesoftware.systembartint:systembartint:1.0.3'
3940
compile 'com.jakewharton:butterknife:6.1.0'
4041

4142
// Teads SDK
42-
compile ('tv.teads.sdk:androidsdk:1.2.4@aar') {
43+
compile ('tv.teads.sdk:androidsdk:1.3.2@aar') {
4344
transitive = true;
4445
}
4546
}

‎TeadsSDKDemo/app/proguard-rules.pro

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,54 @@
1515
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
1616
# public *;
1717
#}
18+
19+
# Butter Knife
20+
-keep class butterknife.** { *; }
21+
-dontwarn butterknife.internal.**
22+
-keep class **$$ViewInjector { *; }
23+
24+
-keepclasseswithmembernames class * {
25+
@butterknife.* <fields>;
26+
}
27+
28+
-keepclasseswithmembernames class * {
29+
@butterknife.* <methods>;
30+
}
31+
32+
33+
# ============= Teads
34+
35+
# For WebView JavascriptInterface
36+
-keepattributes JavascriptInterface
37+
-keep public class tv.teads.sdk.adContainer.layout.webview.** { *; }
38+
39+
# Jackson
40+
-dontwarn org.w3c.dom.bootstrap.DOMImplementationRegistry
41+
-keepnames class com.fasterxml.jackson.** { *; }
42+
-keep public class tv.teads.sdk.adServer.parser.json.** {
43+
public protected *;
44+
public void set*(***);
45+
public *** get*();
46+
}
47+
-keepattributes *Annotation*,EnclosingMethod,Signature
48+
-keep class com.fasterxml.jackson.databind.ObjectMapper {
49+
public <methods>;
50+
protected <methods>;
51+
}
52+
-keep class com.fasterxml.jackson.databind.ObjectWriter {
53+
public ** writeValueAsString(**);
54+
}
55+
56+
# Okio
57+
-dontwarn okio.**
58+
59+
# Enums
60+
-keepattributes InnerClasses
61+
-keep public enum tv.teads.sdk.adContent.AdContent$** {
62+
**[] $VALUES;
63+
public *;
64+
}
65+
-keep public enum tv.teads.sdk.publisher.TeadsLog$** {
66+
**[] $VALUES;
67+
public *;
68+
}

‎TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/format/InSwipeViewPagerFragment.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,11 @@ public void onPageScrollStateChanged(int state) {
129129

130130
@Override
131131
public void nativeVideoDidFailLoading(TeadsError teadsError) {
132-
Toast.makeText(this.getActivity(), getString(R.string.didfail), Toast.LENGTH_SHORT).show();
132+
try {
133+
Toast.makeText(this.getActivity(), getString(R.string.didfail), Toast.LENGTH_SHORT).show();
134+
} catch (IllegalStateException ignored){
135+
136+
}
133137
}
134138

135139
@Override

‎TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/format/inboard/InBoardAdFactoryScrollViewFragment.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,11 @@ public void onDestroy(){
9898

9999
@Override
100100
public void nativeVideoDidFailLoading(TeadsError teadsError) {
101-
Toast.makeText(this.getActivity(), getString(R.string.didfail), Toast.LENGTH_SHORT).show();
101+
try {
102+
Toast.makeText(this.getActivity(), getString(R.string.didfail), Toast.LENGTH_SHORT).show();
103+
} catch (IllegalStateException ignored){
104+
105+
}
102106
}
103107

104108
@Override

‎TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/format/inboard/InBoardListViewFragment.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,11 @@ private void setListViewAdapter(ListView listView){
106106

107107
@Override
108108
public void nativeVideoDidFailLoading(TeadsError teadsError) {
109-
Toast.makeText(this.getActivity(), getString(R.string.didfail), Toast.LENGTH_SHORT).show();
109+
try {
110+
Toast.makeText(this.getActivity(), getString(R.string.didfail), Toast.LENGTH_SHORT).show();
111+
} catch (IllegalStateException ignored){
112+
113+
}
110114
}
111115

112116
@Override

‎TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/format/inboard/InBoardScrollViewFragment.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,11 @@ public void onDestroy(){
8585

8686
@Override
8787
public void nativeVideoDidFailLoading(TeadsError teadsError) {
88-
Toast.makeText(this.getActivity(), getString(R.string.didfail), Toast.LENGTH_SHORT).show();
88+
try {
89+
Toast.makeText(this.getActivity(), getString(R.string.didfail), Toast.LENGTH_SHORT).show();
90+
} catch (IllegalStateException ignored){
91+
92+
}
8993
}
9094

9195
@Override

‎TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/format/inboard/InBoardWebViewFragment.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,11 @@ public void onDestroy(){
9090

9191
@Override
9292
public void nativeVideoDidFailLoading(TeadsError teadsError) {
93-
Toast.makeText(this.getActivity(), getString(R.string.didfail), Toast.LENGTH_SHORT).show();
93+
try {
94+
Toast.makeText(this.getActivity(), getString(R.string.didfail), Toast.LENGTH_SHORT).show();
95+
} catch (IllegalStateException ignored){
96+
97+
}
9498
}
9599

96100
@Override

‎TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/format/inread/InReadListViewFragment.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,11 @@ private void setListViewAdapter(ListView listView){
107107

108108
@Override
109109
public void nativeVideoDidFailLoading(TeadsError teadsError) {
110-
Toast.makeText(this.getActivity(), getString(R.string.didfail), Toast.LENGTH_SHORT).show();
110+
try {
111+
Toast.makeText(this.getActivity(), getString(R.string.didfail), Toast.LENGTH_SHORT).show();
112+
} catch (IllegalStateException ignored){
113+
114+
}
111115
}
112116

113117
@Override

‎TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/format/inread/InReadScrollViewFragment.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,11 @@ public void onDestroy(){
8585

8686
@Override
8787
public void nativeVideoDidFailLoading(TeadsError teadsError) {
88-
Toast.makeText(this.getActivity(), getString(R.string.didfail), Toast.LENGTH_SHORT).show();
88+
try {
89+
Toast.makeText(this.getActivity(), getString(R.string.didfail), Toast.LENGTH_SHORT).show();
90+
} catch (IllegalStateException ignored){
91+
92+
}
8993
}
9094

9195
@Override

‎TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/format/inread/InReadWebViewFragment.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,11 @@ public void onDestroy(){
9191

9292
@Override
9393
public void nativeVideoDidFailLoading(TeadsError teadsError) {
94-
Toast.makeText(this.getActivity(), getString(R.string.didfail), Toast.LENGTH_SHORT).show();
94+
try {
95+
Toast.makeText(this.getActivity(), getString(R.string.didfail), Toast.LENGTH_SHORT).show();
96+
} catch (IllegalStateException ignored){
97+
98+
}
9599
}
96100

97101
@Override

0 commit comments

Comments
 (0)