Commit f5486a32 authored by Thomas's avatar Thomas
Browse files

small update

parent f382081a

app/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -9,8 +9,8 @@ android { 
    defaultConfig {

        minSdk 21

        targetSdk 31

        versionCode 393

        versionName "3.0.2"

        versionCode 394

        versionName "3.0.3"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

    }

    flavorDimensions "default"

app/src/main/java/app/fedilab/android/helper/CrossActionHelper.java

+5 −1
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ import androidx.lifecycle.ViewModelProvider; 
import androidx.lifecycle.ViewModelStoreOwner;

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;
@@ -252,9 +255,10 @@ public class CrossActionHelper { 
                .connectTimeout(60, TimeUnit.SECONDS)

                .proxy(Helper.getProxy(context))

                .build();

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

        Retrofit retrofit = new Retrofit.Builder()

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

                .addConverterFactory(GsonConverterFactory.create())

                .addConverterFactory(GsonConverterFactory.create(gson))

                .client(okHttpClient)

                .build();

        return retrofit.create(MastodonSearchService.class);

app/src/main/java/app/fedilab/android/helper/NotificationsHelper.java

+4 −2
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ import com.bumptech.glide.request.RequestListener; 
import com.bumptech.glide.request.target.CustomTarget;

import com.bumptech.glide.request.target.Target;

import com.bumptech.glide.request.transition.Transition;

import com.google.gson.Gson;

import com.google.gson.GsonBuilder;



import java.io.IOException;

import java.util.ArrayList;
@@ -140,10 +142,10 @@ public class NotificationsHelper { 
                .connectTimeout(60, TimeUnit.SECONDS)

                .proxy(Helper.getProxy(context))

                .build();



        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(MastodonNotificationsService.class);

app/src/main/java/app/fedilab/android/helper/PushNotifications.java

+5 −1
Original line number Diff line number Diff line
@@ -26,6 +26,9 @@ import android.os.Looper; 
import androidx.annotation.NonNull;

import androidx.preference.PreferenceManager;



import com.google.gson.Gson;

import com.google.gson.GsonBuilder;



import java.io.IOException;

import java.util.Random;

import java.util.concurrent.TimeUnit;
@@ -134,9 +137,10 @@ public class PushNotifications { 
                .connectTimeout(60, TimeUnit.SECONDS)

                .proxy(Helper.getProxy(context.getApplicationContext()))

                .build();

        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(MastodonNotificationsService.class);

src/fdroid/fastlane/metadata/android/en/changelogs/394.txt

0 → 100644
+1 −0
Original line number Diff line number Diff line 
- Fix crashes for some pleroma instances
 
 No newline at end of file