diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/User.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/User.java index 7a2969507..582981887 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/User.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/api/twitter/model/User.java @@ -65,19 +65,19 @@ public class User extends TwitterResponseObject implements Comparable { boolean isProtected; @JsonField(name = "followers_count") - long followersCount; + long followersCount = -1; @JsonField(name = "friends_count") - long friendsCount; + long friendsCount = -1; @JsonField(name = "listed_count") - long listedCount; + long listedCount = -1; @JsonField(name = "created_at", typeConverter = TwitterDateConverter.class) Date createdAt; @JsonField(name = "favourites_count") - long favouritesCount; + long favouritesCount = -1; @JsonField(name = "utc_offset") int utcOffset; @@ -92,10 +92,10 @@ public class User extends TwitterResponseObject implements Comparable { boolean isVerified; @JsonField(name = "statuses_count") - long statusesCount; + long statusesCount = -1; @JsonField(name = "media_count") - long mediaCount; + long mediaCount = -1; @JsonField(name = "lang") String lang; diff --git a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableUser.java b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableUser.java index c47e19dc3..b0a6624af 100644 --- a/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableUser.java +++ b/twidere.component.common/src/main/java/org/mariotaku/twidere/model/ParcelableUser.java @@ -129,27 +129,27 @@ public class ParcelableUser implements Parcelable, Comparable { @ParcelableThisPlease @JsonField(name = "followers_count") @CursorField(CachedUsers.FOLLOWERS_COUNT) - public long followers_count; + public long followers_count = -1; @ParcelableThisPlease @JsonField(name = "friends_count") @CursorField(CachedUsers.FRIENDS_COUNT) - public long friends_count; + public long friends_count = -1; @ParcelableThisPlease @JsonField(name = "statuses_count") @CursorField(CachedUsers.STATUSES_COUNT) - public long statuses_count; + public long statuses_count = -1; @ParcelableThisPlease @JsonField(name = "favorites_count") @CursorField(CachedUsers.FAVORITES_COUNT) - public long favorites_count; + public long favorites_count = -1; @ParcelableThisPlease @JsonField(name = "listed_count") @CursorField(CachedUsers.LISTED_COUNT) - public long listed_count; + public long listed_count = -1; @ParcelableThisPlease @JsonField(name = "media_count") @CursorField(CachedUsers.MEDIA_COUNT) - public long media_count; + public long media_count = -1; @ParcelableThisPlease @JsonField(name = "background_color") diff --git a/twidere/src/main/java/org/mariotaku/twidere/activity/support/MediaViewerActivity.java b/twidere/src/main/java/org/mariotaku/twidere/activity/support/MediaViewerActivity.java index 324346afd..22fb89f97 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/activity/support/MediaViewerActivity.java +++ b/twidere/src/main/java/org/mariotaku/twidere/activity/support/MediaViewerActivity.java @@ -24,6 +24,7 @@ import android.app.FragmentManager; import android.content.ActivityNotFoundException; import android.content.Intent; import android.content.res.Configuration; +import android.media.AudioAttributes; import android.media.AudioManager; import android.media.MediaPlayer; import android.net.Uri; @@ -927,7 +928,6 @@ public final class MediaViewerActivity extends AbsMediaViewerActivity implements if (getUserVisibleHint()) { mMediaPlayer = mp; mMediaPlayerError = 0; - mp.setAudioStreamType(AudioManager.STREAM_MUSIC); mp.setScreenOnWhilePlaying(true); updateVolume(); mp.setLooping(isLoopEnabled()); diff --git a/twidere/src/main/java/org/mariotaku/twidere/fragment/support/UserFragment.java b/twidere/src/main/java/org/mariotaku/twidere/fragment/support/UserFragment.java index d0ee8188d..5cc2ca1bd 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/fragment/support/UserFragment.java +++ b/twidere/src/main/java/org/mariotaku/twidere/fragment/support/UserFragment.java @@ -441,8 +441,12 @@ public class UserFragment extends BaseSupportFragment implements OnClickListener break; } case TAB_TYPE_MEDIA: { - actionBar.setSubtitle(getResources().getQuantityString(R.plurals.N_media, - (int) user.media_count, user.media_count)); + if (user.media_count < 0) { + actionBar.setSubtitle(R.string.recent_media); + } else { + actionBar.setSubtitle(getResources().getQuantityString(R.plurals.N_media, + (int) user.media_count, user.media_count)); + } break; } case TAB_TYPE_FAVORITES: { diff --git a/twidere/src/main/java/org/mariotaku/twidere/loader/support/MediaTimelineLoader.java b/twidere/src/main/java/org/mariotaku/twidere/loader/support/MediaTimelineLoader.java index b38efc027..558e74051 100644 --- a/twidere/src/main/java/org/mariotaku/twidere/loader/support/MediaTimelineLoader.java +++ b/twidere/src/main/java/org/mariotaku/twidere/loader/support/MediaTimelineLoader.java @@ -78,9 +78,9 @@ public class MediaTimelineLoader extends TwitterAPIStatusesLoader { } final SearchQuery query; if (mTwitterOptimizedSearches) { - query = new SearchQuery("from:" + screenName + " filter:media"); + query = new SearchQuery("from:" + screenName + " filter:media exclude:retweets"); } else { - query = new SearchQuery("@" + screenName + " pic.twitter.com"); + query = new SearchQuery("@" + screenName + " pic.twitter.com -RT"); } query.paging(paging); final ResponseList result = new ResponseList<>(); diff --git a/twidere/src/main/res/values/strings.xml b/twidere/src/main/res/values/strings.xml index 09b1dbb20..ad89a8442 100644 --- a/twidere/src/main/res/values/strings.xml +++ b/twidere/src/main/res/values/strings.xml @@ -850,4 +850,5 @@ Builtin DNS resolver Bandwidth saving mode Disable media preview on metered network + Recent media \ No newline at end of file diff --git a/twidere/src/main/res/xml/preferences_cards.xml b/twidere/src/main/res/xml/preferences_cards.xml index b2de90890..704db036d 100644 --- a/twidere/src/main/res/xml/preferences_cards.xml +++ b/twidere/src/main/res/xml/preferences_cards.xml @@ -35,6 +35,19 @@ android:name="notify_change" android:value="true"/> + + + + + - - - -