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

fixed already sign in case

This commit is contained in:
Mariotaku Lee 2016-04-18 15:24:05 +08:00
parent 748b9fc9d6
commit da601717d5
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
twidere/src/main/java/org/mariotaku/twidere/activity/SignInActivity.java
View File

@ -644,7 +644,7 @@ public class SignInActivity extends BaseActivity implements OnClickListener, Tex
int color = analyseUserProfileColor(user); int color = analyseUserProfileColor(user);
final Pair<String, String> accountType = detectAccountType(twitter, user); final Pair<String, String> accountType = detectAccountType(twitter, user);
final ParcelableAccount account = ParcelableAccountUtils.getAccount(context, final ParcelableAccount account = ParcelableAccountUtils.getAccount(context,
new UserKey(user.getId(), accountType.first)); new UserKey(user.getId(), UserKeyUtils.getUserHost(user)));
if (account != null) { if (account != null) {
color = account.color; color = account.color;
} }
@ -766,7 +766,7 @@ public class SignInActivity extends BaseActivity implements OnClickListener, Tex
int color = analyseUserProfileColor(user); int color = analyseUserProfileColor(user);
final Pair<String, String> accountType = detectAccountType(twitter, user); final Pair<String, String> accountType = detectAccountType(twitter, user);
final ParcelableAccount account = ParcelableAccountUtils.getAccount(activity, final ParcelableAccount account = ParcelableAccountUtils.getAccount(activity,
new UserKey(userId, accountType.first)); new UserKey(userId, UserKeyUtils.getUserHost(user)));
if (account != null) { if (account != null) {
color = account.color; color = account.color;
} }
@ -790,7 +790,7 @@ public class SignInActivity extends BaseActivity implements OnClickListener, Tex
int color = analyseUserProfileColor(user); int color = analyseUserProfileColor(user);
final Pair<String, String> accountType = detectAccountType(twitter, user); final Pair<String, String> accountType = detectAccountType(twitter, user);
final ParcelableAccount account = ParcelableAccountUtils.getAccount(activity, final ParcelableAccount account = ParcelableAccountUtils.getAccount(activity,
new UserKey(userId, accountType.first)); new UserKey(userId, UserKeyUtils.getUserHost(user)));
if (account != null) { if (account != null) {
color = account.color; color = account.color;
} }
@ -812,7 +812,7 @@ public class SignInActivity extends BaseActivity implements OnClickListener, Tex
int color = analyseUserProfileColor(user); int color = analyseUserProfileColor(user);
final Pair<String, String> accountType = detectAccountType(twitter, user); final Pair<String, String> accountType = detectAccountType(twitter, user);
final ParcelableAccount account = ParcelableAccountUtils.getAccount(activity, final ParcelableAccount account = ParcelableAccountUtils.getAccount(activity,
new UserKey(userId, accountType.first)); new UserKey(userId, UserKeyUtils.getUserHost(user)));
if (account != null) { if (account != null) {
color = account.color; color = account.color;
} }

10
twidere/src/main/java/org/mariotaku/twidere/fragment/AccountsManagerFragment.java
View File

@ -46,7 +46,6 @@ import org.mariotaku.twidere.activity.SignInActivity;
import org.mariotaku.twidere.adapter.AccountsAdapter; import org.mariotaku.twidere.adapter.AccountsAdapter;
import org.mariotaku.twidere.model.ParcelableAccount; import org.mariotaku.twidere.model.ParcelableAccount;
import org.mariotaku.twidere.model.UserKey; import org.mariotaku.twidere.model.UserKey;
import org.mariotaku.twidere.provider.TwidereDataStore.AccountSupportColumns;
import org.mariotaku.twidere.provider.TwidereDataStore.Accounts; import org.mariotaku.twidere.provider.TwidereDataStore.Accounts;
import org.mariotaku.twidere.provider.TwidereDataStore.DirectMessages.Inbox; import org.mariotaku.twidere.provider.TwidereDataStore.DirectMessages.Inbox;
import org.mariotaku.twidere.provider.TwidereDataStore.DirectMessages.Outbox; import org.mariotaku.twidere.provider.TwidereDataStore.DirectMessages.Outbox;
@ -139,7 +138,7 @@ public class AccountsManagerFragment extends BaseSupportFragment implements Load
case R.id.delete: { case R.id.delete: {
final AccountDeletionDialogFragment f = new AccountDeletionDialogFragment(); final AccountDeletionDialogFragment f = new AccountDeletionDialogFragment();
final Bundle args = new Bundle(); final Bundle args = new Bundle();
args.putParcelable(EXTRA_ACCOUNT_KEY, account.account_key); args.putLong(EXTRA_ID, account.id);
f.setArguments(args); f.setArguments(args);
f.show(getChildFragmentManager(), FRAGMENT_TAG_ACCOUNT_DELETION); f.show(getChildFragmentManager(), FRAGMENT_TAG_ACCOUNT_DELETION);
break; break;
@ -311,14 +310,13 @@ public class AccountsManagerFragment extends BaseSupportFragment implements Load
@Override @Override
public void onClick(final DialogInterface dialog, final int which) { public void onClick(final DialogInterface dialog, final int which) {
final Bundle args = getArguments(); final Bundle args = getArguments();
final UserKey accountId = args.getParcelable(EXTRA_ACCOUNT_KEY); final long id = args.getLong(EXTRA_ID);
if (accountId == null) return;
final ContentResolver resolver = getContentResolver(); final ContentResolver resolver = getContentResolver();
switch (which) { switch (which) {
case DialogInterface.BUTTON_POSITIVE: { case DialogInterface.BUTTON_POSITIVE: {
final String where = Expression.equalsArgs(AccountSupportColumns.ACCOUNT_KEY) final String where = Expression.equalsArgs(Accounts._ID)
.getSQL(); .getSQL();
final String[] whereArgs = {accountId.toString()}; final String[] whereArgs = {String.valueOf(id)};
resolver.delete(Accounts.CONTENT_URI, where, whereArgs); resolver.delete(Accounts.CONTENT_URI, where, whereArgs);
// Also delete tweets related to the account we previously // Also delete tweets related to the account we previously
// deleted. // deleted.