From 5b557ed061ae0670c1317fa6bcdff2614f52d5fa Mon Sep 17 00:00:00 2001 From: Matthieu <24-artectrex@users.noreply.shinice.net> Date: Mon, 6 Dec 2021 09:56:14 +0000 Subject: [PATCH 1/4] Change discover endpoint used --- app/src/main/java/org/pixeldroid/app/utils/api/PixelfedAPI.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 5c9ce96b..8ccf8448 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 @@ -291,7 +291,7 @@ interface PixelfedAPI { ): Observable // get discover - @GET("/api/v2/discover/posts") + @GET("/api/v1/discover/posts") suspend fun discover() : DiscoverPosts @FormUrlEncoded @@ -304,4 +304,4 @@ interface PixelfedAPI { @Field("forward") forward: Boolean = true ) : Report -} \ No newline at end of file +} From 5af4e563704f568cd0b1747f5f8016bad51ae015 Mon Sep 17 00:00:00 2001 From: Matthieu <24-artectrex@users.noreply.shinice.net> Date: Wed, 15 Dec 2021 13:17:35 +0100 Subject: [PATCH 2/4] Update dependencies --- app/build.gradle | 12 ++++++------ build.gradle | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1b974540..b27f44a8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,8 +28,8 @@ android { applicationId "org.pixeldroid.app" minSdkVersion 23 targetSdkVersion 31 - versionCode 4 - versionName "1.0.beta4" + versionCode 5 + versionName "1.0.beta5" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunnerArguments clearPackageData: 'true' @@ -153,11 +153,11 @@ dependencies { implementation 'com.google.android.material:material:1.4.0' //Dagger (dependency injection) - implementation 'com.google.dagger:dagger-android:2.40.2' - implementation 'com.google.dagger:dagger-android-support:2.40.2' + implementation 'com.google.dagger:dagger-android:2.40.3' + implementation 'com.google.dagger:dagger-android-support:2.40.3' // if you use the support libraries - kapt 'com.google.dagger:dagger-android-processor:2.40.2' - kapt 'com.google.dagger:dagger-compiler:2.40.2' + kapt 'com.google.dagger:dagger-android-processor:2.40.3' + kapt 'com.google.dagger:dagger-compiler:2.40.3' implementation 'com.squareup.okhttp3:okhttp:4.9.1' implementation 'com.squareup.retrofit2:retrofit:2.9.0' diff --git a/build.gradle b/build.gradle index fb915a51..44ca6678 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.3' + classpath 'com.android.tools.build:gradle:7.0.4' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" // NOTE: Do not place your application dependencies here; they belong From 9002e3c240245acd962d7979592e124cf30176a0 Mon Sep 17 00:00:00 2001 From: Matthieu <24-artectrex@users.noreply.shinice.net> Date: Wed, 15 Dec 2021 13:18:05 +0100 Subject: [PATCH 3/4] Remove useless formatting --- .../main/java/org/pixeldroid/app/settings/LicenseActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/org/pixeldroid/app/settings/LicenseActivity.kt b/app/src/main/java/org/pixeldroid/app/settings/LicenseActivity.kt index c8553850..a4cce6cc 100644 --- a/app/src/main/java/org/pixeldroid/app/settings/LicenseActivity.kt +++ b/app/src/main/java/org/pixeldroid/app/settings/LicenseActivity.kt @@ -29,7 +29,7 @@ class LicenseActivity: BaseActivity() { private fun setupRecyclerView() { val text: String = applicationContext.assets.open("licenses.json") - .bufferedReader().use { it.readText().replace("\r\n", "\n") } + .bufferedReader().use { it.readText() } val listObj: List = Gson().fromJson(text, Libraries::class.java).libraries val adapter = OpenSourceLicenseAdapter() From b65ea6e87c48c3aa6945b6a8e3cd850688675ccb Mon Sep 17 00:00:00 2001 From: Matthieu <24-artectrex@users.noreply.shinice.net> Date: Wed, 15 Dec 2021 13:18:28 +0100 Subject: [PATCH 4/4] Fix discover for new api route --- .../org/pixeldroid/app/searchDiscover/SearchDiscoverFragment.kt | 2 +- app/src/main/java/org/pixeldroid/app/utils/api/PixelfedAPI.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/pixeldroid/app/searchDiscover/SearchDiscoverFragment.kt b/app/src/main/java/org/pixeldroid/app/searchDiscover/SearchDiscoverFragment.kt index a0530e7c..a4e634d9 100644 --- a/app/src/main/java/org/pixeldroid/app/searchDiscover/SearchDiscoverFragment.kt +++ b/app/src/main/java/org/pixeldroid/app/searchDiscover/SearchDiscoverFragment.kt @@ -85,7 +85,7 @@ class SearchDiscoverFragment : BaseFragment() { lifecycleScope.launchWhenCreated { try { val discoverPosts = api.discover() - adapter.addPosts(discoverPosts.posts) + adapter.addPosts(discoverPosts) binding.discoverNoInfiniteLoad.visibility = View.VISIBLE showError(show = false) } catch (exception: IOException) { 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 8ccf8448..2b1fa430 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 @@ -292,7 +292,7 @@ interface PixelfedAPI { // get discover @GET("/api/v1/discover/posts") - suspend fun discover() : DiscoverPosts + suspend fun discover() : List @FormUrlEncoded @POST("/api/v1/reports")