Merge pull request #2 from teads/develop

HugoGresse · HugoGresse · commit 19a6fcd8a025 · 2015-04-24T18:41:27.000+02:00
Develop
diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ repositories{
     }
 }
 dependencies {
-    compile ('tv.teads.sdk:androidsdk:1.0.8@aar') {
+    compile ('tv.teads.sdk:androidsdk:1.1.2@aar') {
         transitive = true;
     }
 }
@@ -39,6 +39,13 @@ dependencies {
 Integration instructions are available on the [wiki](https://github.com/teads/TeadsSDK-android/wiki).
 
 ## Changelog
+
+v1.1.2:
+- Improve VAST parsing
+- Implement new media files validation
+- Improve handling of clean functions
+- Various fix & improvement
+
 v1.0.8:
 - Correct some listeners
 - Minor improvements
diff --git a/TeadsSDKDemo/app/app.iml b/TeadsSDKDemo/app/app.iml
@@ -87,18 +87,19 @@
     <orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" name="play-services-plus-7.0.0" level="project" />
+    <orderEntry type="library" exported="" name="okio-1.3.0" level="project" />
     <orderEntry type="library" exported="" name="jackson-databind-2.5.1" level="project" />
     <orderEntry type="library" exported="" name="play-services-base-7.0.0" level="project" />
     <orderEntry type="library" exported="" name="picasso-2.5.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-panorama-7.0.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-safetynet-7.0.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-location-7.0.0" level="project" />
+    <orderEntry type="library" exported="" name="androidsdk-1.1.2" level="project" />
     <orderEntry type="library" exported="" name="play-services-appindexing-7.0.0" level="project" />
     <orderEntry type="library" exported="" name="jackson-annotations-2.5.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-7.0.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-gcm-7.0.0" level="project" />
-    <orderEntry type="library" exported="" name="androidsdk-1.0.8" level="project" />
     <orderEntry type="library" exported="" name="play-services-wearable-7.0.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-wallet-7.0.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-cast-7.0.0" level="project" />
@@ -110,11 +111,12 @@
     <orderEntry type="library" exported="" name="play-services-ads-7.0.0" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-22.0.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-appstate-7.0.0" level="project" />
+    <orderEntry type="library" exported="" name="okhttp-2.3.0" level="project" />
     <orderEntry type="library" exported="" name="android-async-http-1.4.6" level="project" />
     <orderEntry type="library" exported="" name="butterknife-6.1.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-drive-7.0.0" level="project" />
-    <orderEntry type="library" exported="" name="play-services-analytics-7.0.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-games-7.0.0" level="project" />
+    <orderEntry type="library" exported="" name="play-services-analytics-7.0.0" level="project" />
     <orderEntry type="library" exported="" name="cardview-v7-22.0.0" level="project" />
     <orderEntry type="library" exported="" name="play-services-nearby-7.0.0" level="project" />
     <orderEntry type="library" exported="" name="jackson-core-2.5.1" level="project" />
diff --git a/TeadsSDKDemo/app/build.gradle b/TeadsSDKDemo/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "tv.teads.teadssdkdemo"
         minSdkVersion 16
         targetSdkVersion 22
-        versionCode 3
-        versionName "1.0.2"
+        versionCode 4
+        versionName "1.1.2"
         archivesBaseName = "teads-sdkdemo-" + versionName
     }
     buildTypes {
@@ -39,7 +39,7 @@ dependencies {
     compile 'com.jakewharton:butterknife:6.1.0'
 
     // Teads SDK
-    compile ('tv.teads.sdk:androidsdk:1.0.8@aar') {
+    compile ('tv.teads.sdk:androidsdk:1.1.2@aar') {
         transitive = true;
     }
 }
diff --git a/TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/format/InSwipeViewPagerFragment.java b/TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/format/InSwipeViewPagerFragment.java
@@ -242,6 +242,11 @@ public void nativeVideoDidCollapse() {
 
     }
 
+    @Override
+    public void nativeVideoDidClean() {
+
+    }
+
 
     /*----------------------------------------
     * implements DrawerLayout.DrawerListener
diff --git a/TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/format/inboard/InBoardListViewFragment.java b/TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/format/inboard/InBoardListViewFragment.java
@@ -219,6 +219,11 @@ public void nativeVideoDidCollapse() {
 
     }
 
+    @Override
+    public void nativeVideoDidClean() {
+
+    }
+
 
     /*----------------------------------------
     * implements DrawerLayout.DrawerListener
diff --git a/TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/format/inboard/InBoardScrollViewFragment.java b/TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/format/inboard/InBoardScrollViewFragment.java
@@ -198,6 +198,11 @@ public void nativeVideoDidCollapse() {
 
     }
 
+    @Override
+    public void nativeVideoDidClean() {
+
+    }
+
 
     /*----------------------------------------
     * implements DrawerLayout.DrawerListener
diff --git a/TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/format/inboard/InBoardWebViewFragment.java b/TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/format/inboard/InBoardWebViewFragment.java
@@ -202,6 +202,11 @@ public void nativeVideoDidCollapse() {
 
     }
 
+    @Override
+    public void nativeVideoDidClean() {
+
+    }
+
 
     /*----------------------------------------
     * implements DrawerLayout.DrawerListener
diff --git a/TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/format/inread/InReadListViewFragment.java b/TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/format/inread/InReadListViewFragment.java
@@ -220,6 +220,11 @@ public void nativeVideoDidCollapse() {
 
     }
 
+    @Override
+    public void nativeVideoDidClean() {
+
+    }
+
 
     /*----------------------------------------
     * implements DrawerLayout.DrawerListener
diff --git a/TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/format/inread/InReadScrollViewFragment.java b/TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/format/inread/InReadScrollViewFragment.java
@@ -198,6 +198,11 @@ public void nativeVideoDidCollapse() {
 
     }
 
+    @Override
+    public void nativeVideoDidClean() {
+
+    }
+
 
     /*----------------------------------------
     * implements DrawerLayout.DrawerListener
diff --git a/TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/format/inread/InReadWebViewFragment.java b/TeadsSDKDemo/app/src/main/java/tv/teads/teadssdkdemo/format/inread/InReadWebViewFragment.java
@@ -203,6 +203,11 @@ public void nativeVideoDidCollapse() {
 
     }
 
+    @Override
+    public void nativeVideoDidClean() {
+
+    }
+
 
     /*----------------------------------------
     * implements DrawerLayout.DrawerListener

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ repositories{`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`dependencies {`
`31`		`- compile ('tv.teads.sdk:androidsdk:1.0.8@aar') {`
	`31`	`+ compile ('tv.teads.sdk:androidsdk:1.1.2@aar') {`
`32`	`32`	`transitive = true;`
`33`	`33`	`}`
`34`	`34`	`}`
`@@ -39,6 +39,13 @@ dependencies {`
`39`	`39`	`Integration instructions are available on the [wiki](https://github.com/teads/TeadsSDK-android/wiki).`
`40`	`40`
`41`	`41`	`## Changelog`
	`42`	`+`
	`43`	`+v1.1.2:`
	`44`	`+- Improve VAST parsing`
	`45`	`+- Implement new media files validation`
	`46`	`+- Improve handling of clean functions`
	`47`	`+- Various fix & improvement`
	`48`	`+`
`42`	`49`	`v1.0.8:`
`43`	`50`	`- Correct some listeners`
`44`	`51`	`- Minor improvements`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@ android {`
`8`	`8`	`applicationId "tv.teads.teadssdkdemo"`
`9`	`9`	`minSdkVersion 16`
`10`	`10`	`targetSdkVersion 22`
`11`		`- versionCode 3`
`12`		`- versionName "1.0.2"`
	`11`	`+ versionCode 4`
	`12`	`+ versionName "1.1.2"`
`13`	`13`	`archivesBaseName = "teads-sdkdemo-" + versionName`
`14`	`14`	`}`
`15`	`15`	`buildTypes {`
`@@ -39,7 +39,7 @@ dependencies {`
`39`	`39`	`compile 'com.jakewharton:butterknife:6.1.0'`
`40`	`40`
`41`	`41`	`// Teads SDK`
`42`		`- compile ('tv.teads.sdk:androidsdk:1.0.8@aar') {`
	`42`	`+ compile ('tv.teads.sdk:androidsdk:1.1.2@aar') {`
`43`	`43`	`transitive = true;`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -242,6 +242,11 @@ public void nativeVideoDidCollapse() {`
`242`	`242`
`243`	`243`	`}`
`244`	`244`
	`245`	`+ @Override`
	`246`	`+ public void nativeVideoDidClean() {`
	`247`	`+`
	`248`	`+ }`
	`249`	`+`
`245`	`250`
`246`	`251`	`/*----------------------------------------`
`247`	`252`	`* implements DrawerLayout.DrawerListener`
Original file line number	Diff line number	Diff line change
`@@ -219,6 +219,11 @@ public void nativeVideoDidCollapse() {`
`219`	`219`
`220`	`220`	`}`
`221`	`221`
	`222`	`+ @Override`
	`223`	`+ public void nativeVideoDidClean() {`
	`224`	`+`
	`225`	`+ }`
	`226`	`+`
`222`	`227`
`223`	`228`	`/*----------------------------------------`
`224`	`229`	`* implements DrawerLayout.DrawerListener`
Original file line number	Diff line number	Diff line change
`@@ -198,6 +198,11 @@ public void nativeVideoDidCollapse() {`
`198`	`198`
`199`	`199`	`}`
`200`	`200`
	`201`	`+ @Override`
	`202`	`+ public void nativeVideoDidClean() {`
	`203`	`+`
	`204`	`+ }`
	`205`	`+`
`201`	`206`
`202`	`207`	`/*----------------------------------------`
`203`	`208`	`* implements DrawerLayout.DrawerListener`
Original file line number	Diff line number	Diff line change
`@@ -202,6 +202,11 @@ public void nativeVideoDidCollapse() {`
`202`	`202`
`203`	`203`	`}`
`204`	`204`
	`205`	`+ @Override`
	`206`	`+ public void nativeVideoDidClean() {`
	`207`	`+`
	`208`	`+ }`
	`209`	`+`
`205`	`210`
`206`	`211`	`/*----------------------------------------`
`207`	`212`	`* implements DrawerLayout.DrawerListener`
Original file line number	Diff line number	Diff line change
`@@ -220,6 +220,11 @@ public void nativeVideoDidCollapse() {`
`220`	`220`
`221`	`221`	`}`
`222`	`222`
	`223`	`+ @Override`
	`224`	`+ public void nativeVideoDidClean() {`
	`225`	`+`
	`226`	`+ }`
	`227`	`+`
`223`	`228`
`224`	`229`	`/*----------------------------------------`
`225`	`230`	`* implements DrawerLayout.DrawerListener`
Original file line number	Diff line number	Diff line change
`@@ -203,6 +203,11 @@ public void nativeVideoDidCollapse() {`
`203`	`203`
`204`	`204`	`}`
`205`	`205`
	`206`	`+ @Override`
	`207`	`+ public void nativeVideoDidClean() {`
	`208`	`+`
	`209`	`+ }`
	`210`	`+`
`206`	`211`
`207`	`212`	`/*----------------------------------------`
`208`	`213`	`* implements DrawerLayout.DrawerListener`