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

Commit f70cc9e8 authored by Hasib Prince's avatar Hasib Prince
Browse files

resolved conflict: merging main -> 869-unit_test_install_process

parents 4d66ab33 24ae3240

.gitlab-ci.yml

+3 −0
Original line number Diff line number Diff line
@@ -112,6 +112,9 @@ buildReleaseStable: 


lintRelease:

  extends: .lintReleaseDefault

  rules:

    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'

      when: always

  script:

    - ./gradlew lintRelease

  artifacts:

app/build.gradle

+4 −1
Original line number Diff line number Diff line
@@ -11,7 +11,7 @@ plugins { 


def versionMajor = 2

def versionMinor = 4

def versionPatch = 6

def versionPatch = 7



def getGitHash = { ->

    def stdOut = new ByteArrayOutputStream()
@@ -113,6 +113,9 @@ android { 
    lint {

        lintConfig file('lint.xml')

    }

    kotlin.sourceSets.all {

        languageSettings.optIn("kotlin.RequiresOptIn")

    }

}



kapt {

app/src/main/java/foundation/e/apps/MainActivity.kt

+1 −2
Original line number Diff line number Diff line
@@ -304,8 +304,7 @@ class MainActivity : AppCompatActivity() { 


    // TODO: move storage availability code to FileManager Class

    private fun isStorageAvailable(fusedDownload: FusedDownload): Boolean {

        var availableSpace = 0L

        availableSpace = calculateAvailableDiskSpace()

        val availableSpace = calculateAvailableDiskSpace()

        return availableSpace > fusedDownload.appSize + (500 * (1000 * 1000))

    }

app/src/main/java/foundation/e/apps/api/DownloadManager.kt

+0 −2
Original line number Diff line number Diff line
@@ -105,8 +105,6 @@ class DownloadManager @Inject constructor( 
            downloadManager.query(downloadManagerQuery.setFilterById(downloadId))

                .use { cursor ->

                    if (cursor.moveToFirst()) {

                        val id =

                            cursor.getLong(cursor.getColumnIndexOrThrow(DownloadManager.COLUMN_ID))

                        val status =

                            cursor.getInt(cursor.getColumnIndexOrThrow(DownloadManager.COLUMN_STATUS))

                        val totalSizeBytes =

app/src/main/java/foundation/e/apps/api/cleanapk/blockedApps/BlockedAppRepository.kt

+4 −4
Original line number Diff line number Diff line
@@ -50,15 +50,15 @@ class BlockedAppRepository @Inject constructor( 
    fun fetchUpdateOfAppWarningList() {

        downloadManager.downloadFileInCache(

            APP_WARNING_LIST_FILE_URL,

            fileName = "app-lounge-warning-list.json"

        ) { success, path ->

            fileName = WARNING_LIST_FILE_NAME

        ) { success, _ ->

            if (success) {

                parseBlockedAppDataFromFile(path)

                parseBlockedAppDataFromFile()

            }

        }

    }



    private fun parseBlockedAppDataFromFile(path: String) {

    private fun parseBlockedAppDataFromFile() {

        coroutineScope.launch {

            val outputPath = "$cacheDir/warning_list/"

            FileManager.moveFile("$cacheDir/", WARNING_LIST_FILE_NAME, outputPath)