Commit 951fceaa authored by Thomas's avatar Thomas
Browse files

Fix an issue with Pleroma & date parsing

parent 6a692cd1

app/src/main/java/app/fedilab/android/services/PostMessageService.java

+5 −1
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ import androidx.core.app.NotificationCompat; 
import androidx.localbroadcastmanager.content.LocalBroadcastManager;

import androidx.preference.PreferenceManager;



import com.google.gson.Gson;

import com.google.gson.GsonBuilder;



import java.io.IOException;

import java.util.ArrayList;

import java.util.List;
@@ -87,9 +90,10 @@ public class PostMessageService extends IntentService { 
    }



    private static MastodonStatusesService init(Context context, @NonNull String instance) {

        Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss").create();

        Retrofit retrofit = new Retrofit.Builder()

                .baseUrl("https://" + instance + "/api/v1/")

                .addConverterFactory(GsonConverterFactory.create())

                .addConverterFactory(GsonConverterFactory.create(gson))

                .client(getOkHttpClient(context))

                .build();

        return retrofit.create(MastodonStatusesService.class);

app/src/main/java/app/fedilab/android/viewmodel/mastodon/AccountsVM.java

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ public class AccountsVM extends AndroidViewModel { 
    }



    private MastodonAccountsService init(String instance) {

        Gson gson = new GsonBuilder().setDateFormat("MMM dd, yyyy HH:mm:ss").create();

        Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss").create();

        Retrofit retrofit = new Retrofit.Builder()

                .baseUrl("https://" + instance + "/api/v1/")

                .addConverterFactory(GsonConverterFactory.create(gson))

app/src/main/java/app/fedilab/android/viewmodel/mastodon/AdminVM.java

+5 −1
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ import androidx.lifecycle.AndroidViewModel; 
import androidx.lifecycle.LiveData;

import androidx.lifecycle.MutableLiveData;



import com.google.gson.Gson;

import com.google.gson.GsonBuilder;



import java.util.List;

import java.util.concurrent.TimeUnit;
@@ -57,9 +60,10 @@ public class AdminVM extends AndroidViewModel { 
    }



    private MastodonAdminService init(@NonNull String instance) {

        Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss").create();

        Retrofit retrofit = new Retrofit.Builder()

                .baseUrl("https://" + instance + "/api/v1/")

                .addConverterFactory(GsonConverterFactory.create())

                .addConverterFactory(GsonConverterFactory.create(gson))

                .client(okHttpClient)

                .build();

        return retrofit.create(MastodonAdminService.class);

app/src/main/java/app/fedilab/android/viewmodel/mastodon/AnnouncementsVM.java

+5 −1
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ import androidx.lifecycle.AndroidViewModel; 
import androidx.lifecycle.LiveData;

import androidx.lifecycle.MutableLiveData;



import com.google.gson.Gson;

import com.google.gson.GsonBuilder;



import java.util.List;

import java.util.concurrent.TimeUnit;
@@ -52,9 +55,10 @@ public class AnnouncementsVM extends AndroidViewModel { 
    }



    private MastodonAnnouncementsService init(@NonNull String instance) {

        Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss").create();

        Retrofit retrofit = new Retrofit.Builder()

                .baseUrl("https://" + instance + "/api/v1/")

                .addConverterFactory(GsonConverterFactory.create())

                .addConverterFactory(GsonConverterFactory.create(gson))

                .client(okHttpClient)

                .build();

        return retrofit.create(MastodonAnnouncementsService.class);

app/src/main/java/app/fedilab/android/viewmodel/mastodon/AppsVM.java

+5 −1
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ import androidx.lifecycle.AndroidViewModel; 
import androidx.lifecycle.LiveData;

import androidx.lifecycle.MutableLiveData;



import com.google.gson.Gson;

import com.google.gson.GsonBuilder;



import java.util.concurrent.TimeUnit;



import app.fedilab.android.client.endpoints.MastodonAppsService;
@@ -55,9 +58,10 @@ public class AppsVM extends AndroidViewModel { 
    }



    private MastodonAppsService init(String instance) {

        Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd'T'HH:mm:ss").create();

        Retrofit retrofit = new Retrofit.Builder()

                .baseUrl("https://" + instance + "/api/v1/")

                .addConverterFactory(GsonConverterFactory.create())

                .addConverterFactory(GsonConverterFactory.create(gson))

                .client(okHttpClient)

                .build();

        return retrofit.create(MastodonAppsService.class);