Merge branch 'main' into feed-refactor-viewmodel

Author: cooltey

app/build.gradle

@@ -40,7 +40,7 @@ android {
         applicationId 'org.wikipedia'
         minSdk = 23
         targetSdk = 36
-        versionCode 50560
+        versionCode 50561
         testApplicationId 'org.wikipedia.test'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments clearPackageData: 'true'

app/src/main/java/org/wikipedia/donate/DonateDialog.kt

@@ -176,7 +176,7 @@ class DonateDialog : ExtendedBottomSheetDialogFragment() {
                 return@let CampaignCollection.getFormattedCampaignId(it)
             }.orEmpty()
             val donateUrl = url ?: context.getString(R.string.donate_url, formattedCampaignId,
-                WikipediaApp.instance.languageState.systemLanguageCode, BuildConfig.VERSION_NAME)
+                WikipediaApp.instance.languageState.systemLanguageCode, BuildConfig.VERSION_NAME, Prefs.appInstallId)
             CustomTabsUtil.openInCustomTab(context, donateUrl)
         }
     }

app/src/main/res/values/strings_no_translate.xml

@@ -5,7 +5,7 @@
 
     <!-- URLs -->
     <string name="support_email">[email protected]</string>
-    <string name="donate_url">https://donate.wikimedia.org/?wmf_medium=WikipediaApp&amp;wmf_campaign=Android&amp;wmf_source=%1$s&amp;uselang=%2$s&amp;app_version=%3$s</string>
+    <string name="donate_url">https://donate.wikimedia.org/?wmf_medium=WikipediaApp&amp;wmf_campaign=Android&amp;wmf_source=%1$s&amp;uselang=%2$s&amp;app_version=%3$s&amp;app_install_id=%4$s</string>
     <string name="talk_pages_survey_url">https://www.mediawiki.org/wiki/Wikimedia_Apps/Team/Android/Communication/UsertestingOctober2021</string>
     <string name="survey_privacy_policy_url">https://foundation.wikimedia.org/wiki/Legal:Wikipedia_Android_App_Onboarding_Survey_Privacy_Statement</string>
     <string name="image_captions_style_url">https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Images</string>