From fb947bf63963910079daae471c80b57d25bb61cb Mon Sep 17 00:00:00 2001 From: Matthieu <24-artectrex@users.noreply.shinice.net> Date: Thu, 19 Aug 2021 14:26:47 +0200 Subject: [PATCH] Use OffsetDateTime instead of Date in database --- .../main/java/org/pixeldroid/app/posts/PostActivity.kt | 4 ++-- .../java/org/pixeldroid/app/utils/api/PixelfedAPI.kt | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/pixeldroid/app/posts/PostActivity.kt b/app/src/main/java/org/pixeldroid/app/posts/PostActivity.kt index 2c68c62b..77c89db0 100644 --- a/app/src/main/java/org/pixeldroid/app/posts/PostActivity.kt +++ b/app/src/main/java/org/pixeldroid/app/posts/PostActivity.kt @@ -38,8 +38,8 @@ class PostActivity : BaseActivity() { supportActionBar?.setDisplayHomeAsUpEnabled(true) status = intent.getSerializableExtra(POST_TAG) as Status - val viewComments: Boolean = (intent.getSerializableExtra(VIEW_COMMENTS_TAG) ?: false) as Boolean - val postComment: Boolean = (intent.getSerializableExtra(POST_COMMENT_TAG) ?: false) as Boolean + val viewComments: Boolean = intent.getBooleanExtra(VIEW_COMMENTS_TAG, false) + val postComment: Boolean = intent.getBooleanExtra(POST_COMMENT_TAG, false) val user = db.userDao().getActiveUser() diff --git a/app/src/main/java/org/pixeldroid/app/utils/api/PixelfedAPI.kt b/app/src/main/java/org/pixeldroid/app/utils/api/PixelfedAPI.kt index a62dd55d..4ee2c9dc 100644 --- a/app/src/main/java/org/pixeldroid/app/utils/api/PixelfedAPI.kt +++ b/app/src/main/java/org/pixeldroid/app/utils/api/PixelfedAPI.kt @@ -1,8 +1,14 @@ package org.pixeldroid.app.utils.api +import com.google.gson.* import org.pixeldroid.app.utils.api.objects.* import io.reactivex.Observable import okhttp3.MultipartBody +import okhttp3.OkHttpClient +import org.pixeldroid.app.utils.db.AppDatabase +import org.pixeldroid.app.utils.db.entities.UserDatabaseEntity +import org.pixeldroid.app.utils.di.PixelfedAPIHolder +import org.pixeldroid.app.utils.di.TokenAuthenticator import retrofit2.Response import retrofit2.Retrofit import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory @@ -10,6 +16,9 @@ import retrofit2.converter.gson.GsonConverterFactory import retrofit2.http.* import retrofit2.http.Field +import java.time.OffsetDateTime + + /* Implements the Pixelfed API https://docs.pixelfed.org/technical-documentation/api-v1.html