Commit 6ac1ee1f authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃 Committed by brizental
Browse files

fixup! TB 40041 [android]: Implement Tor Network Settings 

Fix 144 rebase Android build errors.
parent 4e888dba

mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorLogsViewModel.kt

+2 −1
Changes for mobile/android/fenix/app/src/main/java/org/mozilla/fenix/tor/TorLogsViewModel.kt: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -79,7 +79,8 @@ class TorLogsViewModel(application: Application) : AndroidViewModel(application) 
    private fun getAllTorLogs(): String {

        var ret = ""

        for (log in torLogs().value

            ?: return getApplication<Application>().getString(R.string.default_error_msg)) {

            // FIXME: It was default_error_msg, but I don't understand where this came in the first place?

            ?: return getApplication<Application>().getString(R.string.preferences_tor_logs)) {

            ret += "${log.timestamp} [${log.type}] ${log.text}\n"

        }

        return ret