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

fixed NPE

This commit is contained in:
Mariotaku Lee 2017-02-08 12:28:00 +08:00
parent 7840478571
commit c032cca828
No known key found for this signature in database
GPG Key ID: 15C10F89D7C33535
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,7 +56,8 @@ public class UserKeyUtils {
return authority.replaceAll("[^\\w\\d\\.]", "-"); return authority.replaceAll("[^\\w\\d\\.]", "-");
} }
public static boolean isSameHost(UserKey accountKey, UserKey userKey) { public static boolean isSameHost(@Nullable UserKey accountKey, @Nullable UserKey userKey) {
if (accountKey == null || userKey == null) return false;
return isSameHost(accountKey.getHost(), userKey.getHost()); return isSameHost(accountKey.getHost(), userKey.getHost());
} }

24
twidere/src/main/kotlin/org/mariotaku/twidere/extension/model/AccountExtensions.kt
View File

@ -7,7 +7,6 @@ import android.os.Looper
import android.support.annotation.RequiresApi import android.support.annotation.RequiresApi
import android.text.TextUtils import android.text.TextUtils
import com.bluelinelabs.logansquare.LoganSquare import com.bluelinelabs.logansquare.LoganSquare
import nl.komponents.kovenant.deferred
import org.mariotaku.ktextension.HexColorFormat import org.mariotaku.ktextension.HexColorFormat
import org.mariotaku.ktextension.toHexColor import org.mariotaku.ktextension.toHexColor
import org.mariotaku.ktextension.toInt import org.mariotaku.ktextension.toInt
@ -26,6 +25,7 @@ import org.mariotaku.twidere.model.util.AccountUtils
import org.mariotaku.twidere.model.util.AccountUtils.ACCOUNT_USER_DATA_KEYS import org.mariotaku.twidere.model.util.AccountUtils.ACCOUNT_USER_DATA_KEYS
import org.mariotaku.twidere.util.ParseUtils import org.mariotaku.twidere.util.ParseUtils
import java.io.IOException import java.io.IOException
import java.util.concurrent.FutureTask
import java.util.concurrent.TimeUnit import java.util.concurrent.TimeUnit
@ -163,25 +163,23 @@ internal object AccountDataQueue {
val handler = Handler(Looper.getMainLooper()) val handler = Handler(Looper.getMainLooper())
fun getUserData(manager: AccountManager, account: Account, key: String): String? { fun getUserData(manager: AccountManager, account: Account, key: String): String? {
val future = FutureTask<String?> { manager.getUserData(account, key) }
if (Thread.currentThread() == Looper.getMainLooper().thread) { if (Thread.currentThread() == Looper.getMainLooper().thread) {
return manager.getUserData(account, key) future.run()
} else handler.post {
future.run()
} }
val deferred = deferred<String?, Exception>() return future.get()
handler.post {
deferred.resolve(manager.getUserData(account, key))
}
return deferred.promise.get()
} }
fun peekAuthToken(manager: AccountManager, account: Account, authTokenType: String): String? { fun peekAuthToken(manager: AccountManager, account: Account, authTokenType: String): String? {
val future = FutureTask<String?> { manager.peekAuthToken(account, authTokenType) }
if (Thread.currentThread() == Looper.getMainLooper().thread) { if (Thread.currentThread() == Looper.getMainLooper().thread) {
return manager.peekAuthToken(account, authTokenType) future.run()
} else handler.post {
future.run()
} }
val deferred = deferred<String?, Exception>() return future.get()
handler.post {
deferred.resolve(manager.peekAuthToken(account, authTokenType))
}
return deferred.promise.get()
} }
} }