Skip to content

Remove manual personalized ads gating #252

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 1 commit into from
Sep 19, 2025
Merged

Remove manual personalized ads gating #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 7 additions & 14 deletions ...rc/main/java/com/d4rk/androidtutorials/java/ui/screens/android/AndroidStudioFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import com.d4rk.androidtutorials.java.databinding.FragmentAndroidStudioBinding;
import com.d4rk.androidtutorials.java.databinding.ItemAndroidStudioCategoryBinding;
import com.d4rk.androidtutorials.java.databinding.ItemAndroidStudioLessonBinding;
import com.d4rk.androidtutorials.java.utils.ConsentUtils;
import com.google.android.gms.ads.AdListener;
import com.google.android.gms.ads.LoadAdError;
import com.google.android.material.card.MaterialCardView;
Expand All @@ -57,7 +56,6 @@ public class AndroidStudioFragment extends Fragment {
private static boolean mobileAdsInitialized = false;
private final List<Object> allItems = new ArrayList<>();
private LessonsAdapter adapter;
private boolean showAds;
private FragmentAndroidStudioBinding binding;

@Nullable
Expand All @@ -71,20 +69,15 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
@Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
showAds = ConsentUtils.canShowPersonalizedAds(requireContext());
if (showAds) {
ensureMobileAdsInitialized();
}
ensureMobileAdsInitialized();
RecyclerView list = binding.lessonsList;
list.setLayoutManager(new LinearLayoutManager(requireContext()));
adapter = new LessonsAdapter();
list.setAdapter(adapter);
if (showAds) {
list.addItemDecoration(new LessonAdSpacingDecoration(requireContext()));
}
list.addItemDecoration(new LessonAdSpacingDecoration(requireContext()));
allItems.clear();
allItems.addAll(loadItems());
populateAdapter(allItems, showAds);
populateAdapter(allItems);

MenuHost menuHost = requireActivity();
menuHost.addMenuProvider(new MenuProvider() {
Expand Down Expand Up @@ -208,7 +201,7 @@ private boolean isBrowserIntent(Intent intent) {
&& ("http".equalsIgnoreCase(scheme) || "https".equalsIgnoreCase(scheme));
}

private void populateAdapter(List<Object> source, boolean showAds) {
private void populateAdapter(List<Object> source) {
List<Object> items = new ArrayList<>();
List<Integer> eligible = new ArrayList<>();
int lessonCount = 0;
Expand All @@ -224,7 +217,7 @@ private void populateAdapter(List<Object> source, boolean showAds) {
firstInCategory = false;
}
}
int adCount = showAds ? lessonCount / 3 : 0;
int adCount = lessonCount / 3;
Collections.shuffle(eligible, new Random());
if (adCount > eligible.size()) {
adCount = eligible.size();
Expand All @@ -248,7 +241,7 @@ private void populateAdapter(List<Object> source, boolean showAds) {
private void filterLessons(String query) {
String lower = query == null ? "" : query.toLowerCase();
if (lower.isEmpty()) {
populateAdapter(allItems, showAds);
populateAdapter(allItems);
return;
}
List<Object> filtered = new ArrayList<>();
Expand All @@ -268,7 +261,7 @@ private void filterLessons(String query) {
}
}
}
populateAdapter(filtered, showAds);
populateAdapter(filtered);
}

private static class AdItem {
Expand Down
5 changes: 0 additions & 5 deletions app/src/main/java/com/d4rk/androidtutorials/java/utils/ConsentUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,4 @@ public static void updateFirebaseConsent(Context context,
adPersonalization ? FirebaseAnalytics.ConsentStatus.GRANTED : FirebaseAnalytics.ConsentStatus.DENIED);
FirebaseAnalytics.getInstance(context).setConsent(consentMap);
}

public static boolean canShowPersonalizedAds(Context context) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
return prefs.getBoolean(context.getString(R.string.key_consent_ad_storage), true);
}
}
35 changes: 0 additions & 35 deletions app/src/test/java/com/d4rk/androidtutorials/java/utils/ConsentUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package com.d4rk.androidtutorials.java.utils;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
Expand Down Expand Up @@ -103,37 +101,4 @@ public void updateFirebaseConsent_setsExpectedStatuses() {
}
}

@Test
public void canShowAds_readsStoredPreference() {
Context context = mock(Context.class);
SharedPreferences prefs = mock(SharedPreferences.class);
when(context.getString(R.string.key_consent_ad_storage)).thenReturn("consent_ad_storage");

try (MockedStatic<PreferenceManager> prefsStatic = Mockito.mockStatic(PreferenceManager.class)) {
prefsStatic.when(() -> PreferenceManager.getDefaultSharedPreferences(context)).thenReturn(prefs);

when(prefs.getBoolean("consent_ad_storage", true)).thenReturn(false);
assertFalse(ConsentUtils.canShowPersonalizedAds(context));

when(prefs.getBoolean("consent_ad_storage", true)).thenReturn(true);
assertTrue(ConsentUtils.canShowPersonalizedAds(context));
}
}

@Test
public void canShowAds_returnsDefaultWhenPreferenceMissing() {
Context context = mock(Context.class);
SharedPreferences prefs = mock(SharedPreferences.class);
when(context.getString(R.string.key_consent_ad_storage)).thenReturn("consent_ad_storage");

try (MockedStatic<PreferenceManager> prefsStatic = Mockito.mockStatic(PreferenceManager.class)) {
prefsStatic.when(() -> PreferenceManager.getDefaultSharedPreferences(context)).thenReturn(prefs);

when(prefs.getBoolean("consent_ad_storage", true))
.thenAnswer(invocation -> invocation.getArgument(1));

assertTrue(ConsentUtils.canShowPersonalizedAds(context));
verify(prefs).getBoolean("consent_ad_storage", true);
}
}
}