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

Commit ad9884de authored by Sayantan Roychowdhury's avatar Sayantan Roychowdhury
Browse files

Merge branch '1088-translate_downloading_notification' into 'main'

extracted string for downloading...

See merge request !281
parents 5bb3ad55 c7ec7115
Loading
Loading
Loading
Loading
Loading
+5 −1
Original line number Diff line number Diff line
@@ -18,8 +18,11 @@
package foundation.e.apps.api

import android.app.DownloadManager
import android.content.Context
import android.net.Uri
import dagger.hilt.android.qualifiers.ApplicationContext
import foundation.e.apps.OpenForTesting
import foundation.e.apps.R
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
@@ -37,6 +40,7 @@ import kotlin.time.Duration.Companion.seconds
@Singleton
@OpenForTesting
class DownloadManager @Inject constructor(
    @ApplicationContext private val context: Context,
    private val downloadManager: DownloadManager,
    @Named("cacheDir") private val cacheDir: String,
    private val downloadManagerQuery: DownloadManager.Query,
@@ -95,7 +99,7 @@ class DownloadManager @Inject constructor(
        var downloadId = -1L
        try {
            val request = DownloadManager.Request(Uri.parse(url))
                .setTitle("Downloading...")
                .setTitle(context.getString(R.string.downloading))
                .setDestinationUri(Uri.fromFile(downloadFile))
            downloadId = downloadManager.enqueue(request)
        } catch (e: java.lang.NullPointerException) {
+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.os.Environment
import androidx.annotation.RequiresApi
import androidx.lifecycle.LiveData
import dagger.hilt.android.qualifiers.ApplicationContext
import foundation.e.apps.R
import foundation.e.apps.manager.database.DatabaseRepository
import foundation.e.apps.manager.database.fusedDownload.FusedDownload
import foundation.e.apps.manager.download.data.DownloadProgressLD
@@ -208,7 +209,7 @@ class FusedManagerImpl @Inject constructor(
                File(parentPath, "${fusedDownload.packageName}_$count.apk")
            }
            val request = DownloadManager.Request(Uri.parse(it))
                .setTitle(if (count == 1) fusedDownload.name else "Additional file for ${fusedDownload.name}")
                .setTitle(if (count == 1) fusedDownload.name else context.getString(R.string.additional_file_for, fusedDownload.name))
                .setDestinationUri(Uri.fromFile(packagePath))
            val requestId = downloadManager.enqueue(request)
            DownloadProgressLD.setDownloadId(requestId)
+2 −1
Original line number Diff line number Diff line
@@ -121,7 +121,8 @@
    <string name="why_open_source_version">Why am I seeing the Open Source version?</string>
    <string name="open_source_apps">Open Source apps</string>
    <string name="duplicate_app_from_sources">Some proprietary apps may also have an Open Source version. Whenever this happens App Lounge shows the Open Source version only, in order to avoid duplicates.</string>

    <string name="downloading">Downloading…</string>
    <string name="additional_file_for">Additional file for %s</string>


    <!-- Updates Fragment -->