Mastodon
/
Twidere-App-Android-Twitter-Mastodon
mirror of https://github.com/TwidereProject/Twidere-Android
1
0
Fork 0
Code Issues Releases Wiki Activity

fixed fanfou host

This commit is contained in:
Mariotaku Lee 2016-08-25 01:09:39 +08:00
parent 482c99cb4f
commit 3629cd2d8f
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
twidere/src/main/java/org/mariotaku/twidere/model/util/UserKeyUtils.java
View File

@ -7,7 +7,6 @@ import android.support.annotation.Nullable;
import android.text.TextUtils;
import org.mariotaku.microblog.library.twitter.model.User;
import org.mariotaku.twidere.TwidereConstants;
import org.mariotaku.twidere.model.ParcelableUser;
import org.mariotaku.twidere.model.UserKey;
import org.mariotaku.twidere.provider.TwidereDataStore.Accounts;
@ -16,10 +15,13 @@ import org.mariotaku.twidere.util.UriUtils;
import java.util.ArrayList;
import static org.mariotaku.twidere.TwidereConstants.USER_TYPE_FANFOU_COM;
import static org.mariotaku.twidere.TwidereConstants.USER_TYPE_TWITTER_COM;
/**
* Created by mariotaku on 16/3/7.
*/
public class UserKeyUtils implements TwidereConstants {
public class UserKeyUtils {
private UserKeyUtils() {
}
@ -72,21 +74,13 @@ public class UserKeyUtils implements TwidereConstants {
}
public static boolean isFanfouUser(User user) {
return isFanfouUrl(user.getProfileImageUrlLarge()) || isFanfouUrl(user.getProfileImageUrl())
|| isFanfouUrl(user.getProfileBackgroundImageUrl());
return user.getUniqueId() != null && user.getProfileImageUrlLarge() != null;
}
public static boolean isFanfouUser(ParcelableUser user) {
return isFanfouUrl(user.profile_image_url) || isFanfouUrl(user.profile_background_url);
return USER_TYPE_FANFOU_COM.equals(user.key.getHost());
}
static boolean isFanfouUrl(String url) {
return url != null && isFanfouHost(getUserHost(url, "twitter.com"));
}
private static boolean isFanfouHost(@NonNull String host) {
return TextUtils.equals("fanfou.com", host) || host.endsWith(".fanfou.com");
}
@NonNull
public static String getUserHost(@Nullable String uri, @Nullable String def) {

4
twidere/src/main/kotlin/org/mariotaku/twidere/fragment/ParcelableStatusesFragment.kt
View File

@ -151,8 +151,8 @@ abstract class ParcelableStatusesFragment : AbsStatusesFragment() {
// Load the last item
val idx = adapter!!.statusStartIndex + adapter.rawStatusCount - 1
if (idx < 0) return
val status = adapter.getStatus(idx)
val accountKeys = arrayOf(status!!.account_key)
val status = adapter.getStatus(idx) ?: return
val accountKeys = arrayOf(status.account_key)
val maxIds = arrayOf(status.id)
page += pageDelta
val param = BaseRefreshTaskParam(accountKeys, maxIds, null)