Skip to content

Internal Updates. #1422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 10, 2023
Merged

Internal Updates. #1422

Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e0a01a9
Remove query parameters from native image urls that may download a we…
nakirekommula Aug 8, 2023
92660db
include regex import
nakirekommula Aug 8, 2023
d6e6adf
Add comment to state the necessity for trimming native image urls.
nakirekommula Aug 10, 2023
c7fad78
Address review comments.
nakirekommula Aug 10, 2023
ab29618
Use robust logic to trim webp parameter
nakirekommula Aug 10, 2023
9ac8f4a
Merge branch 'main' into feature/gma_native_2023_test
nakirekommula Aug 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions gma/src/android/native_ad_image_android.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
#include <jni.h>

#include <memory>
#include <regex>
#include <string>

#include "gma/src/android/gma_android.h"
Expand Down Expand Up @@ -71,6 +72,10 @@ NativeAdImage::NativeAdImage(
FIREBASE_ASSERT(j_uri);
internal_->uri = util::JniUriToString(env, j_uri);

// Images requested with an android user agent may return webp images. Trim
// webp parameter from image url to get the original JPG/PNG image.
internal_->uri = std::regex_replace(internal_->uri, std::regex("-rw"), "");

// NativeAdImage scale.
jdouble j_scale =
env->CallDoubleMethod(internal_->native_ad_image,
Expand Down