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

Merge branch 'develop' into preference-support

This commit is contained in:
Mariotaku Lee 2016-03-13 11:13:59 +08:00
parent 04c0ca61b6 9a086729ea
commit cc86ed3ccc
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1092,7 +1092,7 @@ public class SignInActivity extends BaseAppCompatActivity implements OnClickList
}
}
values.put(Accounts.ACCOUNT_KEY, user.getId());
values.put(Accounts.ACCOUNT_KEY, UserKeyUtils.fromUser(user).toString());
values.put(Accounts.SCREEN_NAME, user.getScreenName());
values.put(Accounts.NAME, user.getName());
values.put(Accounts.PROFILE_IMAGE_URL, TwitterContentUtils.getProfileImageUrl(user));

5
twidere/src/main/java/org/mariotaku/twidere/loader/support/TwitterAPIStatusesLoader.java
View File

@ -75,10 +75,11 @@ public abstract class TwitterAPIStatusesLoader extends ParcelableStatusesLoader
private final boolean mLoadingMore;
// Statuses sorted descending by default
private Comparator<ParcelableStatus> mComparator = ParcelableStatus.REVERSE_COMPARATOR;
@Inject
DiskCache mFileCache;
protected DiskCache mFileCache;
@Inject
SharedPreferencesWrapper mPreferences;
protected SharedPreferencesWrapper mPreferences;
public TwitterAPIStatusesLoader(@NonNull final Context context,
@Nullable final UserKey accountKey,