-
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Use system User Name for API requests
Fix #2
- Loading branch information
1 parent
c0a85a9
commit 9fe0b6b
Showing
5 changed files
with
63 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
app/src/main/java/org/proninyaroslav/opencomicvine/di/UserAgentProviderModule.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
package org.proninyaroslav.opencomicvine.di | ||
|
||
import dagger.Binds | ||
import dagger.Module | ||
import dagger.hilt.InstallIn | ||
import dagger.hilt.components.SingletonComponent | ||
import org.proninyaroslav.opencomicvine.model.network.UserAgentProvider | ||
import org.proninyaroslav.opencomicvine.model.network.UserAgentProviderImpl | ||
import javax.inject.Singleton | ||
|
||
@Module | ||
@InstallIn(SingletonComponent::class) | ||
abstract class UserAgentProviderModule { | ||
@Singleton | ||
@Binds | ||
abstract fun bindUserAgentModule(provider: UserAgentProviderImpl): UserAgentProvider | ||
} |
17 changes: 17 additions & 0 deletions
17
app/src/main/java/org/proninyaroslav/opencomicvine/model/network/UserAgentInterceptor.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
package org.proninyaroslav.opencomicvine.model.network | ||
|
||
import okhttp3.Interceptor | ||
import okhttp3.Response | ||
import javax.inject.Inject | ||
|
||
class UserAgentInterceptor @Inject constructor( | ||
private val userAgentProvider: UserAgentProvider | ||
) : Interceptor { | ||
override fun intercept(chain: Interceptor.Chain): Response { | ||
return chain.proceed( | ||
chain.request().newBuilder() | ||
.addHeader("user-agent", userAgentProvider.getSystemUserAgent()) | ||
.build() | ||
) | ||
} | ||
} |
24 changes: 24 additions & 0 deletions
24
app/src/main/java/org/proninyaroslav/opencomicvine/model/network/UserAgentProvider.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
package org.proninyaroslav.opencomicvine.model.network | ||
|
||
import android.content.Context | ||
import android.webkit.WebSettings | ||
import dagger.hilt.android.qualifiers.ApplicationContext | ||
import javax.inject.Inject | ||
|
||
interface UserAgentProvider { | ||
fun getSystemUserAgent(): String | ||
} | ||
|
||
const val FALLBACK_USER_AGENT = "Mozilla/5.0 (Linux; U; Android 4.1; en-us; DV Build/Donut)" | ||
|
||
class UserAgentProviderImpl @Inject constructor( | ||
@ApplicationContext | ||
private val context: Context | ||
) : UserAgentProvider { | ||
override fun getSystemUserAgent(): String = try { | ||
WebSettings.getDefaultUserAgent(context) | ||
} catch (e: UnsupportedOperationException) { | ||
/* Fallback user agent if WebView doesn't supported */ | ||
FALLBACK_USER_AGENT | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters