From bf2311d5c9263f55372f8cabbb99bf75af186f90 Mon Sep 17 00:00:00 2001 From: Mariotaku Lee Date: Thu, 31 Mar 2016 08:09:41 +0800 Subject: [PATCH] fixed user id crashes --- .../constant/CompatibilityConstants.java | 5 +-- .../twidere/model/ParcelableStatus.java | 33 +++++++++++++----- .../twidere/activity/ComposeActivity.java | 1 - .../twidere/loader/ParcelableUserLoader.java | 4 ++- .../model/tab/argument/TabArguments.java | 22 ++++++------ .../org/mariotaku/twidere/util/Utils.java | 34 ++++++++++++------- .../src/main/res/xml/preferences_about.xml | 22 ++++++------ 7 files changed, 73 insertions(+), 48 deletions(-) diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/constant/CompatibilityConstants.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/constant/CompatibilityConstants.java index e67d3f826..f8aec631c 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/constant/CompatibilityConstants.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/constant/CompatibilityConstants.java @@ -6,11 +6,8 @@ package org.mariotaku.twidere.constant; public interface CompatibilityConstants { String QUERY_PARAM_ACCOUNT_ID = "account_id"; - String QUERY_PARAM_ACCOUNT_IDS = "account_ids"; - + String QUERY_PARAM_USER_ID = "user_id"; String EXTRA_ACCOUNT_ID = "account_id"; - String EXTRA_ACCOUNT_IDS = "account_ids"; - String EXTRA_USER_ID = "user_id"; } diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java index b779eab47..fcba4a96a 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableStatus.java @@ -56,12 +56,14 @@ public class ParcelableStatus implements Parcelable, Comparable CREATOR = new Creator() { + @Override public ParcelableStatus createFromParcel(Parcel source) { ParcelableStatus target = new ParcelableStatus(); ParcelableStatusParcelablePlease.readFromParcel(target, source); return target; } + @Override public ParcelableStatus[] newArray(int size) { return new ParcelableStatus[size]; } @@ -385,22 +387,24 @@ public class ParcelableStatus implements Parcelable, Comparable + android:data="twidere://user?user_key=583328497@twitter.com&finish_only=true"/> + android:data="twidere://user?user_key=57610574@twitter.com&finish_only=true"/> + android:data="twidere://user_list_members?list_id=99024901&user_key=583328497@twitter.com&finish_only=true"/> @@ -53,49 +53,49 @@ android:title="ilovinheart"> + android:data="twidere://user?user_key=144878723@twitter.com&finish_only=true"/> + android:data="twidere://user?user_key=450691326@twitter.com&finish_only=true"/> + android:data="twidere://user?user_key=12630242@twitter.com&finish_only=true"/> + android:data="twidere://user?user_key=332135263@twitter.com&finish_only=true"/> + android:data="twidere://user?user_key=218536728@twitter.com&finish_only=true"/> + android:data="twidere://user?user_key=1062473329@twitter.com&finish_only=true"/> + android:data="twidere://user?user_key=7758552@twitter.com&finish_only=true"/> @@ -104,7 +104,7 @@ android:title="@string/kuma_union"> + android:data="twidere://user?user_key=514378421@twitter.com&finish_only=true"/>