Fix wrong unread notification count for some accounts on 4.3
This commit is contained in:
parent
3247d4f2f5
commit
c139f85b99
|
@ -13,8 +13,8 @@ android {
|
||||||
applicationId "org.joinmastodon.android"
|
applicationId "org.joinmastodon.android"
|
||||||
minSdk 23
|
minSdk 23
|
||||||
targetSdk 34
|
targetSdk 34
|
||||||
versionCode 121
|
versionCode 122
|
||||||
versionName "2.7.2"
|
versionName "2.7.3"
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,10 +1,27 @@
|
||||||
package org.joinmastodon.android.api.requests.notifications;
|
package org.joinmastodon.android.api.requests.notifications;
|
||||||
|
|
||||||
|
import org.joinmastodon.android.api.ApiUtils;
|
||||||
import org.joinmastodon.android.api.MastodonAPIRequest;
|
import org.joinmastodon.android.api.MastodonAPIRequest;
|
||||||
|
import org.joinmastodon.android.model.NotificationType;
|
||||||
|
|
||||||
|
import java.util.EnumSet;
|
||||||
|
|
||||||
public class GetUnreadNotificationsCount extends MastodonAPIRequest<GetUnreadNotificationsCount.Response>{
|
public class GetUnreadNotificationsCount extends MastodonAPIRequest<GetUnreadNotificationsCount.Response>{
|
||||||
public GetUnreadNotificationsCount(){
|
public GetUnreadNotificationsCount(EnumSet<NotificationType> includeTypes, EnumSet<NotificationType> groupedTypes){
|
||||||
super(HttpMethod.GET, "/notifications/unread_count", Response.class);
|
super(HttpMethod.GET, "/notifications/unread_count", Response.class);
|
||||||
|
if(includeTypes!=null){
|
||||||
|
for(String type: ApiUtils.enumSetToStrings(includeTypes, NotificationType.class)){
|
||||||
|
addQueryParameter("types[]", type);
|
||||||
|
}
|
||||||
|
for(String type:ApiUtils.enumSetToStrings(EnumSet.complementOf(includeTypes), NotificationType.class)){
|
||||||
|
addQueryParameter("exclude_types[]", type);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(groupedTypes!=null){
|
||||||
|
for(String type:ApiUtils.enumSetToStrings(groupedTypes, NotificationType.class)){
|
||||||
|
addQueryParameter("grouped_types[]", type);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -296,7 +296,7 @@ public class HomeFragment extends AppKitFragment{
|
||||||
if(instance==null)
|
if(instance==null)
|
||||||
return;
|
return;
|
||||||
if(instance.getApiVersion()>=2){
|
if(instance.getApiVersion()>=2){
|
||||||
new GetUnreadNotificationsCount()
|
new GetUnreadNotificationsCount(EnumSet.allOf(NotificationType.class), NotificationType.getGroupableTypes())
|
||||||
.setCallback(new Callback<>(){
|
.setCallback(new Callback<>(){
|
||||||
@Override
|
@Override
|
||||||
public void onSuccess(GetUnreadNotificationsCount.Response result){
|
public void onSuccess(GetUnreadNotificationsCount.Response result){
|
||||||
|
|
Loading…
Reference in New Issue