Merge branch 'discover_api_fix' into 'master'

Change discover endpoint used

See merge request pixeldroid/PixelDroid!403

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'

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) {

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<OpenSourceItem> = Gson().fromJson(text, Libraries::class.java).libraries
 
         val adapter = OpenSourceLicenseAdapter()

app/src/main/java/org/pixeldroid/app/utils/api/PixelfedAPI.kt

@@ -291,8 +291,8 @@ interface PixelfedAPI {
     ): Observable<Attachment>
 
     // get discover
-    @GET("/api/v2/discover/posts")
-    suspend fun discover() : DiscoverPosts
+    @GET("/api/v1/discover/posts")
+    suspend fun discover() : List<Status>
 
     @FormUrlEncoded
     @POST("/api/v1/reports")
@@ -304,4 +304,4 @@ interface PixelfedAPI {
         @Field("forward") forward: Boolean = true
     ) : Report
 
-}
+}

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