mobi/e-ntfy-android
1
0
Fork 0
Code Pull requests Activity

User agent

Browse source
This commit is contained in:
Philipp Heckel 2021-12-14 09:23:01 -05:00
parent 164e2e55fd
commit ad2c0d6f27
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/io/heckel/ntfy/msg/ApiService.kt
View file

@ -1,8 +1,10 @@
package io.heckel.ntfy.msg package io.heckel.ntfy.msg
import android.os.Build
import android.util.Log import android.util.Log
import androidx.annotation.Keep import androidx.annotation.Keep
import com.google.gson.Gson import com.google.gson.Gson
import io.heckel.ntfy.BuildConfig
import io.heckel.ntfy.data.Notification import io.heckel.ntfy.data.Notification
import io.heckel.ntfy.util.topicUrl import io.heckel.ntfy.util.topicUrl
import io.heckel.ntfy.util.topicUrlJson import io.heckel.ntfy.util.topicUrlJson
@ -23,7 +25,6 @@ class ApiService {
.readTimeout(15, TimeUnit.SECONDS) .readTimeout(15, TimeUnit.SECONDS)
.writeTimeout(15, TimeUnit.SECONDS) .writeTimeout(15, TimeUnit.SECONDS)
.build() .build()
private val subscriberClient = OkHttpClient.Builder() private val subscriberClient = OkHttpClient.Builder()
.readTimeout(77, TimeUnit.SECONDS) // Assuming that keepalive messages are more frequent than this .readTimeout(77, TimeUnit.SECONDS) // Assuming that keepalive messages are more frequent than this
.build() .build()
@ -35,6 +36,7 @@ class ApiService {
var builder = Request.Builder() var builder = Request.Builder()
.url(url) .url(url)
.put(message.toRequestBody()) .put(message.toRequestBody())
.addHeader("User-Agent", USER_AGENT)
if (priority in 1..5) { if (priority in 1..5) {
builder = builder.addHeader("X-Priority", priority.toString()) builder = builder.addHeader("X-Priority", priority.toString())
} }
@ -59,7 +61,10 @@ class ApiService {
val url = topicUrlJsonPoll(baseUrl, topic) val url = topicUrlJsonPoll(baseUrl, topic)
Log.d(TAG, "Polling topic $url") Log.d(TAG, "Polling topic $url")
val request = Request.Builder().url(url).build(); val request = Request.Builder()
.url(url)
.addHeader("User-Agent", USER_AGENT)
.build()
client.newCall(request).execute().use { response -> client.newCall(request).execute().use { response ->
if (!response.isSuccessful) { if (!response.isSuccessful) {
throw Exception("Unexpected response ${response.code} when polling topic $url") throw Exception("Unexpected response ${response.code} when polling topic $url")
@ -85,7 +90,10 @@ class ApiService {
val url = topicUrlJson(baseUrl, topics, sinceVal) val url = topicUrlJson(baseUrl, topics, sinceVal)
Log.d(TAG, "Opening subscription connection to $url") Log.d(TAG, "Opening subscription connection to $url")
val request = Request.Builder().url(url).build() val request = Request.Builder()
.url(url)
.addHeader("User-Agent", USER_AGENT)
.build()
val call = subscriberClient.newCall(request) val call = subscriberClient.newCall(request)
call.enqueue(object : Callback { call.enqueue(object : Callback {
override fun onResponse(call: Call, response: Response) { override fun onResponse(call: Call, response: Response) {
@ -157,6 +165,7 @@ class ApiService {
companion object { companion object {
private const val TAG = "NtfyApiService" private const val TAG = "NtfyApiService"
private val USER_AGENT = "ntfy/${BuildConfig.VERSION_NAME} (${BuildConfig.FLAVOR}; Android ${Build.VERSION.RELEASE}; SDK ${Build.VERSION.SDK_INT})"
// These constants have corresponding values in the server codebase! // These constants have corresponding values in the server codebase!
const val CONTROL_TOPIC = "~control" const val CONTROL_TOPIC = "~control"