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

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

refactor: centralize F-Droid base URL

parent 47cbb743

app/build.gradle

+5 −1
Original line number Diff line number Diff line
@@ -116,13 +116,17 @@ android { 
        versionCode = versionMajor * 1000000 + versionMinor * 1000 + versionPatch

        versionName = "${versionMajor}.${versionMinor}.${versionPatch}"



        def fdroidHost = "f-droid.org"



        buildConfigField "String", "BUILD_ID", "\"${getGitHash() + "." + getDate()}\""

        buildConfigField("String", "SENTRY_DSN", "\"${getSentryDsn()}\"")

        buildConfigField "String", "USER_AGENT", "\"${retrieveKey("user_agent", "Dalvik/2.1.0 (Linux; U; Android %s)")}\""

        buildConfigField "String", "FDROID_HOST", "\"${fdroidHost}\""

        buildConfigField "String", "FDROID_REPO_BASE_URL", "\"https://${fdroidHost}/repo/\""



        def parentalControlPkgName = "foundation.e.parentalcontrol"



        manifestPlaceholders = [parentalControlPkgName: parentalControlPkgName]

        manifestPlaceholders = [parentalControlPkgName: parentalControlPkgName, fdroidHost: fdroidHost]

        buildConfigField "String", "PACKAGE_NAME_PARENTAL_CONTROL", "\"${parentalControlPkgName}\""



        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"

app/src/main/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ 


                <data android:scheme="https" />

                <data android:scheme="http" />

                <data android:host="f-droid.org" />

                <data android:host="${fdroidHost}" />

                <data android:pathAdvancedPattern="/packages/[^/]+" />

                <data android:pathAdvancedPattern="/packages/[^/]+/" />

                <data android:pathAdvancedPattern="/[^/]+/packages/[^/]+" />

app/src/main/java/foundation/e/apps/data/application/data/Application.kt

+2 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import androidx.core.net.toUri 
import com.aurora.gplayapi.Constants.Restriction

import com.aurora.gplayapi.data.models.ContentRating

import com.google.gson.annotations.SerializedName

import foundation.e.apps.BuildConfig

import foundation.e.apps.data.cleanapk.CleanApkRetrofit

import foundation.e.apps.data.enums.FilterLevel

import foundation.e.apps.data.enums.Source
@@ -142,7 +143,7 @@ val Application.shareUri: Uri 
private fun buildFDroidUri(packageName: String): Uri {

    return Uri.Builder()

        .scheme("https")

        .authority("f-droid.org")

        .authority(BuildConfig.FDROID_HOST)

        .appendPath("packages")

        .appendPath(packageName)

        .build()

app/src/main/java/foundation/e/apps/data/di/network/RetrofitApiModule.kt

+2 −1
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 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.CleanApkRetrofit

import foundation.e.apps.data.di.network.NetworkModule.getYamlFactory

import foundation.e.apps.data.ecloud.EcloudApiInterface
@@ -103,7 +104,7 @@ class RetrofitApiModule { 
    @Provides

    fun provideFDroidMonitorApi(okHttpClient: OkHttpClient, moshi: Moshi): FDroidMonitorApi {

        return Retrofit.Builder()

            .baseUrl(FDroidMonitorApi.BASE_URL)

            .baseUrl(BuildConfig.FDROID_REPO_BASE_URL)

            .client(okHttpClient)

            .addConverterFactory(MoshiConverterFactory.create(moshi))

            .build()

app/src/main/java/foundation/e/apps/data/parentalcontrol/fdroid/FDroidMonitorApi.kt

+0 −4
Original line number Diff line number Diff line
@@ -23,10 +23,6 @@ import retrofit2.http.GET 


interface FDroidMonitorApi {



    companion object {

        const val BASE_URL = "https://f-droid.org/repo/"

    }



    @GET("status/update.json")

    suspend fun getMonitorData(): Response<FDroidMonitorData>

}