Skip to content

Commit a65cfb1

Browse files
committed
fix data retrieval error handling
1 parent dda7576 commit a65cfb1

File tree

2 files changed

+8
-5
lines changed

2 files changed

+8
-5
lines changed

app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ android {
1111
applicationId "org.blitzortung.android.app"
1212
minSdkVersion 15
1313
targetSdkVersion 29
14-
versionCode 263
14+
versionCode 264
1515
versionName '2.1.0'
1616
multiDexEnabled true
1717
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/src/main/java/org/blitzortung/android/data/FetchDataTask.kt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
package org.blitzortung.android.data
22

3+
import android.util.Log
34
import kotlinx.coroutines.*
5+
import org.blitzortung.android.app.Main
46
import org.blitzortung.android.app.R
57
import org.blitzortung.android.data.provider.data.DataProvider
68
import org.blitzortung.android.data.provider.result.ResultEvent
79
import java.net.SocketException
810
import java.net.SocketTimeoutException
11+
import java.net.UnknownHostException
912
import kotlin.coroutines.CoroutineContext
1013
import kotlin.reflect.KSuspendFunction1
1114

@@ -47,8 +50,6 @@ internal open class FetchDataTask(
4750
handleErrorUserFeedback(e)
4851

4952
ResultEvent(failed = true, referenceTime = System.currentTimeMillis(), parameters = parameters, flags = flags)
50-
51-
null
5253
}
5354
}
5455

@@ -57,14 +58,16 @@ internal open class FetchDataTask(
5758
is SocketTimeoutException ->
5859
R.string.timeout_warning
5960

60-
is SocketException ->
61+
is SocketException, is UnknownHostException->
6162
R.string.connection_warning
6263

6364
else -> null
6465
}
6566

6667
if (warningToastStringResource != null) {
67-
toast.invoke(warningToastStringResource)
68+
withContext(Dispatchers.Main) {
69+
toast.invoke(warningToastStringResource)
70+
}
6871
}
6972
}
7073

0 commit comments

Comments
 (0)