Skip to content

Commit bbacfd7

Browse files
committed
fix(app): backward compatibility for Stream apis
Signed-off-by: Trumeet <[email protected]>
1 parent b5bb5dd commit bbacfd7

File tree

2 files changed

+13
-7
lines changed

2 files changed

+13
-7
lines changed

app/build.gradle

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,6 @@ dependencies {
9191
testImplementation 'junit:junit:4.12'
9292
androidTestImplementation 'androidx.test:runner:1.1.1'
9393
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
94-
implementation 'com.elvishew:xlog:1.6.1'
95-
implementation project(':common')
96-
implementation 'moe.shizuku.preference:preference:3.0.0'
97-
implementation 'moe.shizuku.preference:preference-dialog-android:3.0.0'
98-
implementation 'moe.shizuku.preference:preference-simplemenu:3.0.0'
9994
implementation 'com.google.android.material:material:1.1.0-alpha02'
10095
def nav_version = "1.0.0-alpha08"
10196
implementation "android.arch.navigation:navigation-fragment:$nav_version"
@@ -107,4 +102,14 @@ dependencies {
107102
implementation 'com.google.android.gms:play-services-oss-licenses:16.0.1'
108103
// Fabric
109104
implementation 'com.crashlytics.sdk.android:crashlytics:2.9.8'
105+
// Stream support for Java8-
106+
implementation 'com.annimon:stream:1.2.1'
107+
// Preferences
108+
implementation 'moe.shizuku.preference:preference:3.0.0'
109+
implementation 'moe.shizuku.preference:preference-dialog-android:3.0.0'
110+
implementation 'moe.shizuku.preference:preference-simplemenu:3.0.0'
111+
// Logger
112+
implementation 'com.elvishew:xlog:1.6.1'
113+
// Common
114+
implementation project(':common')
110115
}

app/src/main/java/moe/yuuta/mipushtester/topic/TopicSubscriptionFragment.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
import android.view.View;
66
import android.view.ViewGroup;
77

8+
import com.annimon.stream.Collectors;
9+
import com.annimon.stream.Stream;
810
import com.elvishew.xlog.Logger;
911
import com.elvishew.xlog.XLog;
1012
import com.google.android.material.snackbar.Snackbar;
1113
import com.xiaomi.mipush.sdk.MiPushClient;
1214

1315
import java.util.List;
14-
import java.util.stream.Collectors;
1516

1617
import androidx.annotation.NonNull;
1718
import androidx.annotation.Nullable;
@@ -79,7 +80,7 @@ public void onFailure(@NonNull Call<List<Topic>> call, @NonNull Throwable t) {
7980

8081
private void displayTopicsToUI (List<Topic> originalList) {
8182
List<String> localSubscribedTopics = MiPushClient.getAllTopic(requireContext());
82-
List<Topic> list = originalList.stream()
83+
List<Topic> list = Stream.of(originalList)
8384
.peek(topic -> topic.setSubscribed(localSubscribedTopics.contains(topic.getId())))
8485
.collect(Collectors.toList());
8586
DiffUtil.DiffResult result = DiffUtil.calculateDiff(new DiffUtil.Callback() {

0 commit comments

Comments
 (0)