Updates samples to v3.35.0.

PiperOrigin-RevId: 673054076
googleads · Sep 10, 2024 · 669a8fa · 669a8fa
1 parent 9a98510
commit 669a8fa
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/basicexample/app/build.gradle b/basicexample/app/build.gradle
@@ -36,5 +36,5 @@ dependencies {
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.browser:browser:1.8.0'
     implementation 'androidx.media:media:1.7.0'
-    implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.34.0'
+    implementation 'com.google.ads.interactivemedia.v3:interactivemedia:3.35.0'
 }
diff --git a/...p/src/main/java/com/google/ads/interactivemedia/v3/samples/videoplayerapp/MyActivity.java b/...p/src/main/java/com/google/ads/interactivemedia/v3/samples/videoplayerapp/MyActivity.java
@@ -58,7 +58,6 @@ public class MyActivity extends AppCompatActivity {
   // the VideoView.
   private VideoView videoPlayer;
   private MediaController mediaController;
-  private View playButton;
   private VideoAdPlayerAdapter videoAdPlayerAdapter;
 
   @Override
@@ -91,15 +90,15 @@ protected void onCreate(Bundle savedInstanceState) {
         new AdErrorEvent.AdErrorListener() {
           /** An event raised when there is an error loading or playing ads. */
           @Override
-          public void onAdError(AdErrorEvent adErrorEvent) {
+          public void onAdError(@NonNull AdErrorEvent adErrorEvent) {
             Log.i(LOGTAG, "Ad Error: " + adErrorEvent.getError().getMessage());
             resumeContent();
           }
         });
     adsLoader.addAdsLoadedListener(
         new AdsLoader.AdsLoadedListener() {
           @Override
-          public void onAdsManagerLoaded(AdsManagerLoadedEvent adsManagerLoadedEvent) {
+          public void onAdsManagerLoaded(@NonNull AdsManagerLoadedEvent adsManagerLoadedEvent) {
             // Ads were successfully loaded, so get the AdsManager instance. AdsManager has
             // events for ad playback and errors.
             adsManager = adsManagerLoadedEvent.getAdsManager();
@@ -109,7 +108,7 @@ public void onAdsManagerLoaded(AdsManagerLoadedEvent adsManagerLoadedEvent) {
                 new AdErrorEvent.AdErrorListener() {
                   /** An event raised when there is an error loading or playing ads. */
                   @Override
-                  public void onAdError(AdErrorEvent adErrorEvent) {
+                  public void onAdError(@NonNull AdErrorEvent adErrorEvent) {
                     Log.e(LOGTAG, "Ad Error: " + adErrorEvent.getError().getMessage());
                     String universalAdIds =
                         Arrays.toString(adsManager.getCurrentAd().getUniversalAdIds());
@@ -125,7 +124,7 @@ public void onAdError(AdErrorEvent adErrorEvent) {
                 new AdEvent.AdEventListener() {
                   /** Responds to AdEvents. */
                   @Override
-                  public void onAdEvent(AdEvent adEvent) {
+                  public void onAdEvent(@NonNull AdEvent adEvent) {
                     if (adEvent.getType() != AdEvent.AdEventType.AD_PROGRESS) {
                       Log.i(LOGTAG, "Event: " + adEvent.getType());
                     }
@@ -182,7 +181,7 @@ public void onAdEvent(AdEvent adEvent) {
         });
 
     // When the play button is clicked, request ads and hide the button.
-    playButton = findViewById(R.id.playButton);
+    View playButton = findViewById(R.id.playButton);
     playButton.setOnClickListener(
         view -> {
           videoPlayer.setVideoPath(SAMPLE_VIDEO_URL);

diff --git a/.../java/com/google/ads/interactivemedia/v3/samples/videoplayerapp/VideoAdPlayerAdapter.java b/.../java/com/google/ads/interactivemedia/v3/samples/videoplayerapp/VideoAdPlayerAdapter.java
@@ -7,6 +7,7 @@
 import android.net.Uri;
 import android.util.Log;
 import android.widget.VideoView;
+import androidx.annotation.NonNull;
 import com.google.ads.interactivemedia.v3.api.AdPodInfo;
 import com.google.ads.interactivemedia.v3.api.player.AdMediaInfo;
 import com.google.ads.interactivemedia.v3.api.player.VideoAdPlayer;
@@ -40,12 +41,12 @@ public VideoAdPlayerAdapter(VideoView videoPlayer, AudioManager audioManager) {
   }
 
   @Override
-  public void addCallback(VideoAdPlayerCallback videoAdPlayerCallback) {
+  public void addCallback(@NonNull VideoAdPlayerCallback videoAdPlayerCallback) {
     videoAdPlayerCallbacks.add(videoAdPlayerCallback);
   }
 
   @Override
-  public void loadAd(AdMediaInfo adMediaInfo, AdPodInfo adPodInfo) {
+  public void loadAd(@NonNull AdMediaInfo adMediaInfo, @NonNull AdPodInfo adPodInfo) {
     // This simple ad loading logic works because preloading is disabled. To support
     // preloading ads your app must maintain state for the currently playing ad
     // while handling upcoming ad downloading and buffering at the same time.
@@ -55,7 +56,7 @@ public void loadAd(AdMediaInfo adMediaInfo, AdPodInfo adPodInfo) {
   }
 
   @Override
-  public void pauseAd(AdMediaInfo adMediaInfo) {
+  public void pauseAd(@NonNull AdMediaInfo adMediaInfo) {
     Log.i(LOGTAG, "pauseAd");
     savedAdPosition = videoPlayer.getCurrentPosition();
     stopAdTracking();
@@ -89,12 +90,12 @@ public void release() {
   }
 
   @Override
-  public void removeCallback(VideoAdPlayerCallback videoAdPlayerCallback) {
+  public void removeCallback(@NonNull VideoAdPlayerCallback videoAdPlayerCallback) {
     videoAdPlayerCallbacks.remove(videoAdPlayerCallback);
   }
 
   @Override
-  public void stopAd(AdMediaInfo adMediaInfo) {
+  public void stopAd(@NonNull AdMediaInfo adMediaInfo) {
     Log.i(LOGTAG, "stopAd");
     stopAdTracking();
   }
@@ -177,7 +178,7 @@ private void stopAdTracking() {
   }
 
   @Override
-  public VideoProgressUpdate getAdProgress() {
+  public @NonNull VideoProgressUpdate getAdProgress() {
     long adPosition = videoPlayer.getCurrentPosition();
     return new VideoProgressUpdate(adPosition, adDuration);
   }

diff --git a/basicexample/build.gradle b/basicexample/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.2'
+        classpath 'com.android.tools.build:gradle:8.6.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/basicexample/gradle/wrapper/gradle-wrapper.properties b/basicexample/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-all.zip