Mholloway has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/338157 )
Change subject: Revert to Android Support Library 25.0.1
......................................................................
Revert to Android Support Library 25.0.1
N.B. This requires removing usages of ArraySet again, since ArraySet was
introduced in 25.1.0.
Bug: T158347
Change-Id: I33c9798c120c25654da24f19c1606c6dc164d837
---
M app/build.gradle
M app/src/main/java/org/wikipedia/database/contract/ReadingListPageContract.java
M app/src/main/java/org/wikipedia/dataclient/SharedPreferenceCookieManager.java
M
app/src/main/java/org/wikipedia/json/RequiredFieldsCheckOnReadTypeAdapterFactory.java
M app/src/main/java/org/wikipedia/login/User.java
M app/src/main/java/org/wikipedia/login/UserExtendedInfoClient.java
M app/src/main/java/org/wikipedia/readinglist/page/ReadingListPageRow.java
M app/src/test/java/org/wikipedia/login/UserTest.java
8 files changed, 18 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/57/338157/1
diff --git a/app/build.gradle b/app/build.gradle
index 3e0cb9d..ab19e91 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -159,7 +159,7 @@
String okHttpVersion = '3.4.1'
String retrofitVersion = '2.1.0'
- String supportVersion = '25.1.1'
+ String supportVersion = '25.0.1'
String espressoVersion = '2.2.2'
String butterKnifeVersion = '8.4.0'
String frescoVersion = '0.13.0'
diff --git
a/app/src/main/java/org/wikipedia/database/contract/ReadingListPageContract.java
b/app/src/main/java/org/wikipedia/database/contract/ReadingListPageContract.java
index 58b3a45..b3bc3e5 100644
---
a/app/src/main/java/org/wikipedia/database/contract/ReadingListPageContract.java
+++
b/app/src/main/java/org/wikipedia/database/contract/ReadingListPageContract.java
@@ -2,7 +2,6 @@
import android.net.Uri;
import android.support.annotation.NonNull;
-import android.support.v4.util.ArraySet;
import org.wikipedia.database.DbUtil;
import org.wikipedia.database.column.CodeEnumColumn;
@@ -19,6 +18,7 @@
import org.wikipedia.readinglist.page.database.disk.DiskStatus;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Set;
@SuppressWarnings("checkstyle:interfaceistype")
@@ -34,7 +34,7 @@
CsvColumn<Set<String>> LIST_KEYS = new
CsvColumn<Set<String>>(TABLE_PAGE, "listKeys",
"text not null") {
@NonNull @Override protected Set<String> val(@NonNull
Collection<String> strs) {
- return new ArraySet<>(strs);
+ return new HashSet<>(strs);
}
@NonNull @Override protected Collection<String> put(@NonNull
Set<String> row) {
diff --git
a/app/src/main/java/org/wikipedia/dataclient/SharedPreferenceCookieManager.java
b/app/src/main/java/org/wikipedia/dataclient/SharedPreferenceCookieManager.java
index 05deee0..4859e5d 100644
---
a/app/src/main/java/org/wikipedia/dataclient/SharedPreferenceCookieManager.java
+++
b/app/src/main/java/org/wikipedia/dataclient/SharedPreferenceCookieManager.java
@@ -2,7 +2,6 @@
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
-import android.support.v4.util.ArraySet;
import android.text.TextUtils;
import org.wikipedia.login.User;
@@ -17,6 +16,7 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -84,7 +84,7 @@
throw new IllegalArgumentException("Argument is null");
}
- ArraySet<String> domainsModified = new ArraySet<>();
+ HashSet<String> domainsModified = new HashSet<>();
for (String headerKey : responseHeaders.keySet()) {
if (headerKey == null ||
!headerKey.equalsIgnoreCase("Set-Cookie")) {
diff --git
a/app/src/main/java/org/wikipedia/json/RequiredFieldsCheckOnReadTypeAdapterFactory.java
b/app/src/main/java/org/wikipedia/json/RequiredFieldsCheckOnReadTypeAdapterFactory.java
index 4361055..7f9542a 100644
---
a/app/src/main/java/org/wikipedia/json/RequiredFieldsCheckOnReadTypeAdapterFactory.java
+++
b/app/src/main/java/org/wikipedia/json/RequiredFieldsCheckOnReadTypeAdapterFactory.java
@@ -2,7 +2,6 @@
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
-import android.support.v4.util.ArraySet;
import com.google.gson.Gson;
import com.google.gson.JsonParseException;
@@ -17,6 +16,7 @@
import java.io.IOException;
import java.lang.reflect.Field;
import java.util.Collections;
+import java.util.HashSet;
import java.util.Set;
/**
@@ -44,7 +44,7 @@
@NonNull private Set<Field> collectRequiredFields(@NonNull Class<?> clazz)
{
Field[] fields = clazz.getDeclaredFields();
- Set<Field> required = new ArraySet<>();
+ Set<Field> required = new HashSet<>();
for (Field field : fields) {
if (field.isAnnotationPresent(Required.class)) {
required.add(field);
diff --git a/app/src/main/java/org/wikipedia/login/User.java
b/app/src/main/java/org/wikipedia/login/User.java
index 8a739fe..aaca2c5 100644
--- a/app/src/main/java/org/wikipedia/login/User.java
+++ b/app/src/main/java/org/wikipedia/login/User.java
@@ -3,11 +3,11 @@
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
-import android.support.v4.util.ArraySet;
import org.apache.commons.lang3.StringUtils;
import java.util.Collections;
+import java.util.HashSet;
import java.util.Set;
public class User {
@@ -69,7 +69,7 @@
this.userID = userID;
this.userIDLang = userIDLang;
if (groups != null) {
- this.groups = Collections.unmodifiableSet(new ArraySet<>(groups));
+ this.groups = Collections.unmodifiableSet(new HashSet<>(groups));
} else {
this.groups = Collections.emptySet();
}
diff --git a/app/src/main/java/org/wikipedia/login/UserExtendedInfoClient.java
b/app/src/main/java/org/wikipedia/login/UserExtendedInfoClient.java
index 9989238..10b359f 100644
--- a/app/src/main/java/org/wikipedia/login/UserExtendedInfoClient.java
+++ b/app/src/main/java/org/wikipedia/login/UserExtendedInfoClient.java
@@ -3,7 +3,6 @@
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.annotation.VisibleForTesting;
-import android.support.v4.util.ArraySet;
import com.google.gson.annotations.SerializedName;
@@ -15,6 +14,7 @@
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -123,7 +123,7 @@
@Nullable Set<String> getGroupsFor(@NonNull String userName) {
if (userName.equals(name) && implicitGroups != null) {
- Set<String> groups = new ArraySet<>();
+ Set<String> groups = new HashSet<>();
groups.addAll(Arrays.asList(implicitGroups));
return Collections.unmodifiableSet(groups);
} else {
diff --git
a/app/src/main/java/org/wikipedia/readinglist/page/ReadingListPageRow.java
b/app/src/main/java/org/wikipedia/readinglist/page/ReadingListPageRow.java
index 40911e4..13cad57 100644
--- a/app/src/main/java/org/wikipedia/readinglist/page/ReadingListPageRow.java
+++ b/app/src/main/java/org/wikipedia/readinglist/page/ReadingListPageRow.java
@@ -2,7 +2,6 @@
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
-import android.support.v4.util.ArraySet;
import com.google.gson.annotations.SerializedName;
@@ -15,6 +14,7 @@
import org.wikipedia.util.ValidateUtil;
import java.util.Collections;
+import java.util.HashSet;
import java.util.Set;
public class ReadingListPageRow extends BaseModel {
@@ -104,7 +104,7 @@
protected ReadingListPageRow(@NonNull Builder<?> builder) {
key = builder.key;
- listKeys = new ArraySet<>(builder.listKeys);
+ listKeys = new HashSet<>(builder.listKeys);
wiki = builder.wiki;
namespace = builder.namespace;
title = builder.title;
@@ -118,7 +118,7 @@
@SuppressWarnings("unchecked")
public static class Builder<Clazz extends Builder<Clazz>> {
private String key;
- private Set<String> listKeys = new ArraySet<>();
+ private Set<String> listKeys = new HashSet<>();
private WikiSite wiki;
private Namespace namespace;
private String title;
@@ -146,13 +146,13 @@
}
public Clazz listKeys(@NonNull String listKey) {
- listKeys = new ArraySet<>();
+ listKeys = new HashSet<>();
listKeys.add(listKey);
return (Clazz) this;
}
public Clazz listKeys(@NonNull Set<String> listKeys) {
- this.listKeys = new ArraySet<>(listKeys);
+ this.listKeys = new HashSet<>(listKeys);
return (Clazz) this;
}
diff --git a/app/src/test/java/org/wikipedia/login/UserTest.java
b/app/src/test/java/org/wikipedia/login/UserTest.java
index f825bdb..9632120 100644
--- a/app/src/test/java/org/wikipedia/login/UserTest.java
+++ b/app/src/test/java/org/wikipedia/login/UserTest.java
@@ -1,7 +1,5 @@
package org.wikipedia.login;
-import android.support.v4.util.ArraySet;
-
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -9,6 +7,7 @@
import java.util.Arrays;
import java.util.Collections;
+import java.util.HashSet;
import java.util.Set;
import static org.hamcrest.MatcherAssert.assertThat;
@@ -19,7 +18,7 @@
public class UserTest {
private static final int USER_ID = 333;
private static final Set<String> GROUPS
- = Collections.unmodifiableSet(new ArraySet<>(Arrays.asList("*",
"user", "autoconfirmed")));
+ = Collections.unmodifiableSet(new HashSet<>(Arrays.asList("*",
"user", "autoconfirmed")));
@Before
public void setUp() {
--
To view, visit https://gerrit.wikimedia.org/r/338157
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I33c9798c120c25654da24f19c1606c6dc164d837
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
