From d4da83bba3753ae81b137c1c1f0e5889a73e6715 Mon Sep 17 00:00:00 2001 From: Mariotaku Lee Date: Sun, 13 Mar 2016 10:45:15 +0800 Subject: [PATCH] fixed #437 --- .../mariotaku/twidere/activity/support/ComposeActivity.java | 4 ++-- .../org/mariotaku/twidere/adapter/AccountsSpinnerAdapter.java | 2 +- .../twidere/adapter/ParcelableActivitiesAdapter.java | 2 +- .../mariotaku/twidere/adapter/ParcelableStatusesAdapter.java | 2 +- .../twidere/adapter/SimpleParcelableUsersAdapter.java | 2 +- .../twidere/fragment/support/AccountsDashboardFragment.java | 2 +- .../mariotaku/twidere/fragment/support/StatusFragment.java | 2 +- .../java/org/mariotaku/twidere/util/AsyncTwitterWrapper.java | 3 +-- .../mariotaku/twidere/util/InternalTwitterContentUtils.java | 4 ++-- 9 files changed, 11 insertions(+), 12 deletions(-) diff --git a/twidere/src/main/java/org/mariotaku/twidere/activity/support/ComposeActivity.java b/twidere/src/main/java/org/mariotaku/twidere/activity/support/ComposeActivity.java index ff0cc9f73..cd6c2c94e 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/activity/support/ComposeActivity.java +++ b/twidere/src/main/java/org/mariotaku/twidere/activity/support/ComposeActivity.java @@ -1502,7 +1502,7 @@ public class ComposeActivity extends ThemedFragmentActivity implements OnMenuIte @Override public long getItemId(int position) { - return System.identityHashCode(mAccounts[position]); + return mAccounts[position].hashCode(); } @NonNull @@ -1797,7 +1797,7 @@ public class ComposeActivity extends ThemedFragmentActivity implements OnMenuIte @Override public long getItemId(int position) { - return System.identityHashCode(getItem(position)); + return getItem(position).hashCode(); } @Override diff --git a/twidere/src/main/java/org/mariotaku/twidere/adapter/AccountsSpinnerAdapter.java b/twidere/src/main/java/org/mariotaku/twidere/adapter/AccountsSpinnerAdapter.java index 2dc7f7afe..c4fe8c3b1 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/adapter/AccountsSpinnerAdapter.java +++ b/twidere/src/main/java/org/mariotaku/twidere/adapter/AccountsSpinnerAdapter.java @@ -64,7 +64,7 @@ public class AccountsSpinnerAdapter extends ArrayAdapter @Override public long getItemId(int position) { - return System.identityHashCode(getItem(position)); + return getItem(position).hashCode(); } @Override diff --git a/twidere/src/main/java/org/mariotaku/twidere/adapter/ParcelableActivitiesAdapter.java b/twidere/src/main/java/org/mariotaku/twidere/adapter/ParcelableActivitiesAdapter.java index 657b8a042..d80ebb337 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/adapter/ParcelableActivitiesAdapter.java +++ b/twidere/src/main/java/org/mariotaku/twidere/adapter/ParcelableActivitiesAdapter.java @@ -118,7 +118,7 @@ public class ParcelableActivitiesAdapter extends LoadMoreSupportAdapter selectionArgs = new ArrayList<>(); - builder.append("SELECT NULL WHERE"); + builder.append("SELECT "); if (textPlain != null) { selectionArgs.add(textPlain); builder.append("(SELECT 1 IN (SELECT ? LIKE '%'||" + Filters.Keywords.TABLE_NAME + "." + Filters.VALUE @@ -142,7 +142,7 @@ public class InternalTwitterContentUtils { selectionArgs.toArray(new String[selectionArgs.size()])); if (cur == null) return false; try { - return cur.getCount() > 0; + return cur.moveToFirst() && cur.getInt(0) != 0; } finally { cur.close(); }