diff --git a/app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt b/app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt index c60b4f4..2a948f5 100644 --- a/app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt +++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Client.kt @@ -16,7 +16,7 @@ open class Client { val url = URL("https://${ManagerSingleton.url}/api/v1/$uri") val con = url.openConnection() as HttpURLConnection - con.setRequestProperty("User-Agent", "P2play/0.1") + con.setRequestProperty("User-Agent", "P2play/0.5.3") con.setRequestProperty("Content-Type", "application/x-www-form-urlencoded") con.setRequestProperty("Accept", "*/*") diff --git a/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt b/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt index 69bae6a..5472c38 100644 --- a/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt +++ b/app/src/main/java/org/libre/agosto/p2play/ajax/Videos.kt @@ -1,7 +1,6 @@ package org.libre.agosto.p2play.ajax import android.util.JsonReader -import android.util.JsonToken import org.libre.agosto.p2play.ManagerSingleton import org.libre.agosto.p2play.models.VideoModel import java.io.InputStreamReader @@ -30,12 +29,11 @@ class Videos: Client() { return videos } - private fun getVideos(start:Int, sort:String = "-publishedAt", filter:String = ""):ArrayList{ + private fun getVideos(start:Int, sort:String = "-publishedAt", isLocal:Boolean = false):ArrayList{ val nsfw = ManagerSingleton.nfsw val count = ManagerSingleton.videos_count - var params = "start=$start&count=$count&sort=$sort&nsfw=$nsfw" - if(filter != "") - params+="&filter=$filter" + var params = "start=$start&count=$count&sort=$sort&nsfw=$nsfw&isLocal=$isLocal" + val con = this._newCon("videos?$params","GET") var videos = arrayListOf() try { @@ -65,7 +63,7 @@ class Videos: Client() { } fun getLocalVideos(start:Int = 0): ArrayList{ - return this.getVideos(start,"-publishedAt", "local") + return this.getVideos(start,"-publishedAt", true) } fun myVideos(token: String, start: Int = 0): ArrayList{ @@ -99,6 +97,10 @@ class Videos: Client() { val data = JsonReader(response) videos = parseVideos(data) data.close() + } else { + val response = InputStreamReader(con.inputStream) + val data = JsonReader(response) + print(data) } } catch(err:Exception){ err.printStackTrace() diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a3eeee5..ded5376 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -95,9 +95,9 @@ Show more You have subscribed to this channel - You rated the video + You have rated the video You have unsubscribed from this channel - You commented on this video + You have commented on this video An error has occurred, try again Please make a comment first