Skip to content

Commit b20542a

Browse files
dbrantdbrant
authored
Merge branch 'main' into tempAccounts_design
2 parents 4a66051 + bcbc54b commit b20542a

33 files changed

+203
-179
lines changed

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ android {
3737
applicationId 'org.wikipedia'
3838
minSdk 21
3939
targetSdk 34
40-
versionCode 50499
40+
versionCode 50501
4141
testApplicationId 'org.wikipedia.test'
4242
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4343
testInstrumentationRunnerArguments clearPackageData: 'true'

‎app/src/extra/java/org/wikipedia/donate/GooglePayViewModel.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ class GooglePayViewModel : ViewModel() {
154154
.submitPayment(
155155
decimalFormatCanonical.format(finalAmount),
156156
BuildConfig.VERSION_NAME,
157-
campaignId,
157+
WikipediaApp.instance.appOrSystemLanguageCode + campaignId + "_Android",
158158
billingObj.optString("locality", ""),
159159
currentCountryCode,
160160
currencyCode,

‎app/src/main/java/org/wikipedia/WikipediaApp.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import org.wikipedia.appshortcuts.AppShortcuts
1919
import org.wikipedia.auth.AccountUtil
2020
import org.wikipedia.concurrency.FlowEventBus
2121
import org.wikipedia.connectivity.ConnectionStateMonitor
22+
import org.wikipedia.database.AppDatabase
2223
import org.wikipedia.dataclient.ServiceFactory
2324
import org.wikipedia.dataclient.SharedPreferenceCookieManager
2425
import org.wikipedia.dataclient.WikiSite
@@ -253,6 +254,7 @@ class WikipediaApp : Application() {
253254
ServiceFactory.get(wikiSite).postLogout(token)
254255
}.invokeOnCompletion {
255256
SharedPreferenceCookieManager.instance.clearAllCookies()
257+
AppDatabase.instance.notificationDao().deleteAll()
256258
L.d("Logout complete.")
257259
}
258260
}

‎app/src/main/java/org/wikipedia/analytics/metricsplatform/RecommendedContentAnalyticsHelper.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@ class RecommendedContentAnalyticsHelper {
1212
private val enabledCountries = listOf(
1313
// sub-saharan africa
1414
"AO", "BJ", "BW", "IO", "BF", "BI", "CV", "CM", "CF", "TD", "KM", "CG", "IC", "CD", "DJ", "GQ", "ER",
15-
"SZ", "ET", "GA", "GM", "GH", "GN", "GW", "KE", "LS", "LR", "MG", "MW", "ML", "MR", "YT", "MZ", "NA",
16-
"NE", "NG", "RE", "RW", "SH", "ST", "SN", "SC", "SL", "SO", "ZA", "SS", "TG", "UG", "TZ", "ZM", "ZW",
15+
"SZ", "ET", "GA", "GM", "GH", "GN", "GW", "KE", "LS", "LR", "MG", "MW", "ML", "MR", "MU", "YT", "MZ",
16+
"NA", "NE", "NG", "RE", "RW", "SH", "ST", "SN", "SC", "SL", "SO", "ZA", "SS", "TG", "UG", "TZ", "ZM",
17+
"ZW",
1718
// south asia
18-
"IN", "PK", "BD", "LK", "MU", "MV", "NP", "BT", "AF"
19+
"IN", "PK", "BD", "LK", "MV", "NP", "BT", "AF"
1920
)
2021

2122
val recommendedContentEnabled get() = ReleaseUtil.isPreBetaRelease ||

‎app/src/main/java/org/wikipedia/captcha/CaptchaHandler.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@ class CaptchaHandler(private val activity: AppCompatActivity, private val wiki:
4141
return captchaResult?.captchaId
4242
}
4343

44-
fun captchaWord(): String {
45-
return binding.captchaText.editText?.text.toString()
44+
fun captchaWord(): String? {
45+
return if (isActive) binding.captchaText.editText?.text.toString() else null
4646
}
4747

4848
fun dispose() {

‎app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,8 +162,8 @@ class CreateAccountActivity : BaseActivity() {
162162
val repeat = getText(binding.createAccountPasswordRepeat)
163163
disposables.add(ServiceFactory.get(wiki).postCreateAccount(getText(binding.createAccountUsername), password, repeat, token, Service.WIKIPEDIA_URL,
164164
email,
165-
if (captchaHandler.isActive) captchaHandler.captchaId() else "null",
166-
if (captchaHandler.isActive) captchaHandler.captchaWord() else "null")
165+
captchaHandler.captchaId().toString(),
166+
captchaHandler.captchaWord().toString())
167167
.subscribeOn(Schedulers.io())
168168
.observeOn(AndroidSchedulers.mainThread())
169169
.subscribe({ response ->

‎app/src/main/java/org/wikipedia/dataclient/RestService.kt‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import org.wikipedia.readinglist.sync.SyncedReadingLists.RemoteIdResponseBatch
1717
import org.wikipedia.readinglist.sync.SyncedReadingLists.RemoteReadingList
1818
import org.wikipedia.readinglist.sync.SyncedReadingLists.RemoteReadingListEntry
1919
import org.wikipedia.readinglist.sync.SyncedReadingLists.RemoteReadingListEntryBatch
20-
import org.wikipedia.suggestededits.provider.SuggestedEditItem
2120
import retrofit2.Call
2221
import retrofit2.Response
2322
import retrofit2.http.Body
@@ -197,25 +196,6 @@ interface RestService {
197196
@Query("csrf_token") token: String?
198197
): Call<Unit>
199198

200-
// ------- Recommendations -------
201-
@Headers("Cache-Control: no-cache")
202-
@GET("data/recommendation/caption/addition/{lang}")
203-
suspend fun getImagesWithoutCaptions(@Path("lang") lang: String): List<SuggestedEditItem>
204-
205-
@Headers("Cache-Control: no-cache")
206-
@GET("data/recommendation/caption/translation/from/{fromLang}/to/{toLang}")
207-
suspend fun getImagesWithTranslatableCaptions(@Path("fromLang") fromLang: String,
208-
@Path("toLang") toLang: String): List<SuggestedEditItem>
209-
210-
@Headers("Cache-Control: no-cache")
211-
@GET("data/recommendation/description/addition/{lang}")
212-
suspend fun getArticlesWithoutDescriptions(@Path("lang") lang: String): List<SuggestedEditItem>
213-
214-
@Headers("Cache-Control: no-cache")
215-
@GET("data/recommendation/description/translation/from/{fromLang}/to/{toLang}")
216-
suspend fun getArticlesWithTranslatableDescriptions(@Path("fromLang") fromLang: String,
217-
@Path("toLang") toLang: String): List<SuggestedEditItem>
218-
219199
// ------- Talk pages -------
220200
@Headers("Cache-Control: no-cache")
221201
@GET("page/talk/{title}")

‎app/src/main/java/org/wikipedia/dataclient/Service.kt‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,9 @@ interface Service {
150150
@Query("wbetlanguage") entityLang: String
151151
): MwQueryResponse
152152

153+
@GET(MW_API_PREFIX + "action=query&prop=info&inprop=protection")
154+
suspend fun getProtection(@Query("titles") titles: String): MwQueryResponse
155+
153156
@GET(MW_API_PREFIX + "action=query&meta=userinfo&prop=info&inprop=protection&uiprop=groups")
154157
suspend fun getProtectionWithUserInfo(@Query("titles") titles: String): MwQueryResponse
155158

@@ -190,8 +193,12 @@ interface Service {
190193
@Query("gcmcontinue") continueStr: String?
191194
): MwQueryResponse
192195

193-
@GET(MW_API_PREFIX + "action=query&generator=random&redirects=1&grnnamespace=6&prop=description|imageinfo|revisions&rvprop=ids|timestamp|flags|comment|user|content&rvslots=mediainfo&iiprop=timestamp|user|url|mime|extmetadata&iiurlwidth=" + PREFERRED_THUMB_SIZE)
194-
@Headers("Cache-Control: no-cache")
196+
@GET(MW_API_PREFIX + "action=query&generator=random&redirects=1&grnnamespace=0&prop=pageprops|description|info&inprop=protection")
197+
suspend fun getRandomPages(
198+
@Query("grnlimit") count: Int = 50,
199+
): MwQueryResponse
200+
201+
@GET(MW_API_PREFIX + "action=query&generator=random&redirects=1&grnnamespace=6&prop=info|description|imageinfo|revisions|globalusage&inprop=protection&gunamespace=0&rvprop=ids|timestamp|flags|comment|user|content&rvslots=mediainfo&iiprop=timestamp|user|url|mime|extmetadata&iilocalonly=1&iiurlwidth=" + PREFERRED_THUMB_SIZE)
195202
suspend fun getRandomImages(
196203
@Query("grnlimit") count: Int = 10,
197204
): MwQueryResponse

‎app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.kt‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -337,10 +337,9 @@ class DescriptionEditFragment : Fragment() {
337337
ServiceFactory.get(wikiSite).postEditSubmit(pageTitle.prefixedText, "0", null,
338338
editSummary,
339339
AccountUtil.assertUser, text, null, baseRevId, editToken,
340-
if (captchaHandler.isActive) captchaHandler.captchaId() else null,
341-
if (captchaHandler.isActive) captchaHandler.captchaWord() else null, tags = getEditTags()
342-
)
343-
.subscribeOn(Schedulers.io())
340+
captchaHandler.captchaId(),
341+
captchaHandler.captchaWord(), tags = getEditTags()
342+
).subscribeOn(Schedulers.io())
344343
}
345344
.observeOn(AndroidSchedulers.mainThread())
346345
.subscribe({ result ->

‎app/src/main/java/org/wikipedia/edit/EditSectionActivity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,8 @@ class EditSectionActivity : BaseActivity(), ThemeChooserDialog.Callback, EditPre
309309
disposables.add(ServiceFactory.get(pageTitle.wikiSite).postEditSubmit(pageTitle.prefixedText,
310310
if (sectionID >= 0) sectionID.toString() else null, null, summaryText, AccountUtil.assertUser,
311311
binding.editSectionText.text.toString(), null, currentRevision, token,
312-
if (captchaHandler.isActive) captchaHandler.captchaId() else "null",
313-
if (captchaHandler.isActive) captchaHandler.captchaWord() else "null",
312+
captchaHandler.captchaId().toString(),
313+
captchaHandler.captchaWord().toString(),
314314
isMinorEdit,
315315
watchThisPage,
316316
tags = getEditTag())

0 commit comments

Comments
 (0)