leca
/
barcode_scanner_for_employees
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 7 Wiki Activity

now handling unexpected ws close

This commit is contained in:
leca 2024-11-14 04:02:36 +03:00
parent 988272070d
commit e5772bcad3
6 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/foxarmy/barcodescannerforemployees/Utils.kt
View File

@ -190,6 +190,7 @@ fun isInternetConnectionAvailable(context: Context): Boolean {
} }
fun noInternetConnectionAvailableNotification(context: Context) { fun noInternetConnectionAvailableNotification(context: Context) {
(context as Activity).runOnUiThread {
AlertDialog.Builder(context) AlertDialog.Builder(context)
.setMessage(context.getString(R.string.no_internet_connection)) .setMessage(context.getString(R.string.no_internet_connection))
.setPositiveButton(R.string.quit) { _, _ -> .setPositiveButton(R.string.quit) { _, _ ->
@ -211,3 +212,4 @@ fun noInternetConnectionAvailableNotification(context: Context) {
exitProcess(0) exitProcess(0)
}.show() }.show()
} }
}

2
app/src/main/java/org/foxarmy/barcodescannerforemployees/WebSocketClient.kt
View File

@ -139,10 +139,12 @@ class WebSocketClient(private val context: Context, private val server: String)
override fun onClosing(webSocket: WebSocket, code: Int, reason: String) { override fun onClosing(webSocket: WebSocket, code: Int, reason: String) {
Log.d("QWERTYUIOP", "Closing ws. Reason: $reason") Log.d("QWERTYUIOP", "Closing ws. Reason: $reason")
noInternetConnectionAvailableNotification(context)
} }
override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) { override fun onFailure(webSocket: WebSocket, t: Throwable, response: Response?) {
Log.d("QWERTYUIOP","Connection failed: ${t.message}") Log.d("QWERTYUIOP","Connection failed: ${t.message}")
noInternetConnectionAvailableNotification(context)
} }
}) })
} }

2
app/src/main/res/layout/fragment_add_abstract_product.xml
View File

@ -62,7 +62,7 @@
android:ems="10" android:ems="10"
android:id="@+id/barcodeTextEdit" app:layout_constraintTop_toBottomOf="@+id/imageView" android:id="@+id/barcodeTextEdit" app:layout_constraintTop_toBottomOf="@+id/imageView"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
android:layout_marginTop="8dp" android:hint="Barcode" android:textColorHint="#737373" android:layout_marginTop="8dp" android:hint="@string/barcode" android:textColorHint="#737373"
android:layout_marginStart="5dp"/> android:layout_marginStart="5dp"/>
<CheckBox <CheckBox
android:text="@string/no_barcode" android:text="@string/no_barcode"

2
app/src/main/res/layout/fragment_shelf.xml
View File

@ -2,7 +2,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="#141218"> >
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"

8
app/src/main/res/values-ru/strings.xml
View File

@ -114,10 +114,10 @@
<string name="image_compress_factor">Степень сжатия изображения</string> <string name="image_compress_factor">Степень сжатия изображения</string>
<string name="current_group">Текущая группа</string> <string name="current_group">Текущая группа</string>
<string name="cancel">Отмена</string> <string name="cancel">Отмена</string>
<string name="no_internet_connection">No internet connection available. Please, connect to a network.</string> <string name="no_internet_connection">Не могу установить соединение с сервером. Возможно, вы отключены от сети?</string>
<string name="ok">Ok</string> <string name="ok">Ок</string>
<string name="logout">Log out</string> <string name="logout">Выйти</string>
<string name="online_only_feature">This feature is online only</string> <string name="online_only_feature">Эта возможность доступна только с онлайн аккаунтом</string>
<string-array name="languages"> <string-array name="languages">
<item>en-US</item> <item>en-US</item>
<item>ru-RU</item> <item>ru-RU</item>

4
app/src/main/res/values/strings.xml
View File

@ -112,8 +112,8 @@
<string name="image_compress_factor">Image compression factor</string> <string name="image_compress_factor">Image compression factor</string>
<string name="current_group">Current group</string> <string name="current_group">Current group</string>
<string name="cancel">Cancel</string> <string name="cancel">Cancel</string>
<string name="no_internet_connection">No internet connection available. Please, connect to a network.</string> <string name="no_internet_connection">Cannot reach the server. Maybe, you lost internet connection?</string>
<string name="ok">Ok</string> <string name="ok">OK</string>
<string name="logout">Log out</string> <string name="logout">Log out</string>
<string name="online_only_feature">This feature is online only</string> <string name="online_only_feature">This feature is online only</string>
<string-array name="languages"> <string-array name="languages">