Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Verified Commit 13b79f06 authored by Fahim M. Choudhury's avatar Fahim M. Choudhury
Browse files

refactor: improve network response logging 

Added HttpLoggingInterceptor to log network requests and responses instead of using Timber.

Minor adjustments in colors and strings.
parent cb366aca

app/build.gradle

+1 −0
Original line number Diff line number Diff line
@@ -206,6 +206,7 @@ dependencies { 
    implementation "com.squareup.moshi:moshi-kotlin:1.13.0"

//    implementation "com.squareup.moshi:moshi-adapters:1.5.0"

    implementation "com.squareup.okhttp3:okhttp:4.9.2"

    implementation "com.squareup.okhttp3:logging-interceptor:4.9.2"



    // JSON Converter

    implementation 'com.squareup.retrofit2:converter-gson:2.5.0'

app/src/main/java/foundation/e/apps/data/NetworkHandler.kt

+2 −3
Original line number Diff line number Diff line 
/*

 * Copyright MURENA SAS 2023

 * Apps  Quickly and easily install Android apps onto your device!

 * Copyright (C) 2024 MURENA SAS

 *

 * This program is free software: you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by
@@ -14,6 +13,7 @@ 
 *

 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <https://www.gnu.org/licenses/>.

 *

 */



package foundation.e.apps.data
@@ -66,7 +66,6 @@ private fun <T> resultSupremeGplayHttpRequestException(e: GplayHttpRequestExcept 


private fun <T> handleOthersException(e: Exception): ResultSupreme.Error<T> {

    val message = extractErrorMessage(e)

    Timber.d("message: $message exceptoin: $e")

    return ResultSupreme.Error(message, e)

}

app/src/main/java/foundation/e/apps/data/cleanapk/CleanApkRetrofit.kt

+8 −4
Original line number Diff line number Diff line 
/*

 * Apps  Quickly and easily install Android apps onto your device!

 * Copyright (C) 2021  E FOUNDATION

 * Copyright (C) 2021-2024 MURENA SAS

 *

 * This program is free software: you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by
@@ -14,6 +13,7 @@ 
 *

 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <https://www.gnu.org/licenses/>.

 *

 */



package foundation.e.apps.data.cleanapk
@@ -31,8 +31,12 @@ interface CleanApkRetrofit { 


    companion object {

        // API endpoints

        const val BASE_URL = "https://api.dev.cleanapk.org/v2/"

        const val ASSET_URL = "https://api.dev.cleanapk.org/v2/media/"

        const val BASE_URL = "https://api.cleanapk.org/v2/"

        const val ASSET_URL = "https://api.cleanapk.org/v2/media/"



        // TODO: Configure dev and prod flavors to auto switch URLs

        // const val BASE_URL_DEV = "https://api.dev.cleanapk.org/v2/"

        // const val ASSET_URL_DEV = "https://api.dev.cleanapk.org/v2/media/"



        // Application sources

        const val APP_SOURCE_FOSS = "open"

app/src/main/java/foundation/e/apps/data/cleanapk/RetrofitModule.kt

+33 −17
Original line number Diff line number Diff line 
/*

 * Apps  Quickly and easily install Android apps onto your device!

 * Copyright (C) 2021  E FOUNDATION

 * Copyright (C) 2021-2024 MURENA SAS

 *

 * This program is free software: you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by
@@ -14,6 +13,7 @@ 
 *

 * You should have received a copy of the GNU General Public License

 * along with this program.  If not, see <https://www.gnu.org/licenses/>.

 *

 */



package foundation.e.apps.data.cleanapk
@@ -29,33 +29,32 @@ import dagger.Module 
import dagger.Provides

import dagger.hilt.InstallIn

import dagger.hilt.components.SingletonComponent

import foundation.e.apps.BuildConfig

import foundation.e.apps.data.cleanapk.data.app.Application

import foundation.e.apps.data.ecloud.EcloudApiInterface

import foundation.e.apps.data.exodus.ExodusTrackerApi

import foundation.e.apps.data.fdroid.FdroidApiInterface

import okhttp3.Cache

import okhttp3.Interceptor

import okhttp3.MediaType.Companion.toMediaTypeOrNull

import okhttp3.OkHttpClient

import okhttp3.Protocol

import okhttp3.Response

import okhttp3.ResponseBody.Companion.toResponseBody

import okhttp3.logging.HttpLoggingInterceptor

import retrofit2.Retrofit

import retrofit2.converter.gson.GsonConverterFactory

import retrofit2.converter.jackson.JacksonConverterFactory

import retrofit2.converter.moshi.MoshiConverterFactory

import timber.log.Timber

import java.net.ConnectException

import java.util.Locale

import java.util.concurrent.TimeUnit

import javax.inject.Named

import javax.inject.Singleton





@Module

@InstallIn(SingletonComponent::class)

object RetrofitModule {



    private const val HTTP_TIMEOUT_IN_SECOND = 10L

    private const val HEADER_USER_AGENT = "User-Agent"

    private const val HEADER_ACCEPT_LANGUAGE = "Accept-Language"



    /**

     * Provides an instance of Retrofit to work with CleanAPK API
@@ -63,7 +62,7 @@ object RetrofitModule { 
     */

    @Singleton

    @Provides

    fun provideCleanAPKInterface(okHttpClient: OkHttpClient, moshi: Moshi): CleanApkRetrofit {

    fun provideCleanApkInterface(okHttpClient: OkHttpClient, moshi: Moshi): CleanApkRetrofit {

        return Retrofit.Builder()

            .baseUrl(CleanApkRetrofit.BASE_URL)

            .client(okHttpClient)
@@ -78,7 +77,7 @@ object RetrofitModule { 
     */

    @Singleton

    @Provides

    fun provideCleanAPKDetailApi(

    fun provideCleanApkDetailApi(

        okHttpClient: OkHttpClient,

        @Named("gsonCustomAdapter") gson: Gson

    ): CleanApkAppDetailsRetrofit {
@@ -165,23 +164,40 @@ object RetrofitModule { 
    fun provideInterceptor(): Interceptor {

        return Interceptor { chain ->

            val builder = chain.request().newBuilder()

            Timber.d("Request: URL: ${chain.request().url}")

            builder.header(

                "User-Agent",

                "Dalvik/2.1.0 (Linux; U; Android ${Build.VERSION.RELEASE};)"

            ).header("Accept-Language", Locale.getDefault().language)

                .header(

                    HEADER_USER_AGENT, "Dalvik/2.1.0 (Linux; U; Android ${Build.VERSION.RELEASE};)"

                )

                .header(HEADER_ACCEPT_LANGUAGE, Locale.getDefault().language)



            val response = chain.proceed(builder.build())

            Timber.d("Response: Code: ${response.code} message: ${response.message}")



            return@Interceptor response

        }

    }



    @Provides

    @Singleton

    fun provideLoggingInterceptor(): HttpLoggingInterceptor {

        val interceptor = HttpLoggingInterceptor()



        interceptor.level = when {

            BuildConfig.DEBUG -> HttpLoggingInterceptor.Level.BODY

            else -> HttpLoggingInterceptor.Level.NONE

        }



        return interceptor

    }



    @Singleton

    @Provides

    fun provideOkHttpClient(cache: Cache, interceptor: Interceptor): OkHttpClient {

    fun provideOkHttpClient(

        cache: Cache,

        interceptor: Interceptor,

        httpLoggingInterceptor: HttpLoggingInterceptor

    ): OkHttpClient {

        return OkHttpClient.Builder()

            .addInterceptor(interceptor)

            .addInterceptor(httpLoggingInterceptor) // Put logging interceptor last

            .callTimeout(HTTP_TIMEOUT_IN_SECOND, TimeUnit.SECONDS)

            .cache(cache)

            .build()

app/src/main/res/values-night/colors.xml

+1 −1

File changed.

Contains only whitespace changes.

app/src/main/res/values/colors.xml

+1 −1

File changed.

Contains only whitespace changes.

app/src/main/res/values/strings.xml

+1 −1

File changed.

Contains only whitespace changes.