feat: Update 1.14

dmitrijkotov634 · Jul 1, 2022 · dae6a57 · dae6a57
1 parent 9e4c331
commit dae6a57
Show file tree

Hide file tree

Showing 38 changed files with 536 additions and 1,099 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 android {
-    compileSdkVersion 32
+    compileSdkVersion 33
     buildToolsVersion "30.0.3"
 
     buildFeatures {
@@ -16,9 +16,9 @@ android {
     defaultConfig {
         applicationId "com.dm.bomber"
         minSdkVersion 21
-        targetSdkVersion 32
-        versionCode 23
-        versionName "1.13"
+        targetSdkVersion 33
+        versionCode 26
+        versionName "1.14"
     }
 
     buildTypes {

diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 23,
-      "versionName": "1.13",
+      "versionCode": 26,
+      "versionName": "1.14",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/app/src/main/java/com/dm/bomber/services/Call2Friends.java b/app/src/main/java/com/dm/bomber/services/Call2Friends.java
diff --git a/app/src/main/java/com/dm/bomber/services/Callback.java b/app/src/main/java/com/dm/bomber/services/Callback.java
@@ -8,10 +8,10 @@
 
 public interface Callback extends okhttp3.Callback {
 
-    void onError(Exception e);
+    void onError(@NonNull Call call, @NonNull Exception e);
 
     @Override
     default void onFailure(@NonNull Call call, @NonNull IOException e) {
-        onError(e);
+        onError(call, e);
     }
 }
diff --git a/app/src/main/java/com/dm/bomber/services/Dolyame.java b/app/src/main/java/com/dm/bomber/services/Dolyame.java
@@ -51,7 +51,7 @@ public void onResponse(@NonNull Call call, @NonNull Response response) throws IO
                                     .build())
                             .build()).enqueue(callback);
                 } catch (JSONException | NullPointerException e) {
-                    callback.onError(e);
+                    callback.onError(call, e);
                 }
             }
         });

diff --git a/app/src/main/java/com/dm/bomber/services/Evotor.java b/app/src/main/java/com/dm/bomber/services/Evotor.java
diff --git a/app/src/main/java/com/dm/bomber/services/Fonbet.java b/app/src/main/java/com/dm/bomber/services/Fonbet.java
diff --git a/app/src/main/java/com/dm/bomber/services/Gosuslugi.java b/app/src/main/java/com/dm/bomber/services/Gosuslugi.java
diff --git a/app/src/main/java/com/dm/bomber/services/Labirint.java b/app/src/main/java/com/dm/bomber/services/Labirint.java
diff --git a/app/src/main/java/com/dm/bomber/services/Melzdrav.java b/app/src/main/java/com/dm/bomber/services/Melzdrav.java
diff --git a/app/src/main/java/com/dm/bomber/services/RiveGauche.java b/app/src/main/java/com/dm/bomber/services/RiveGauche.java
diff --git a/app/src/main/java/com/dm/bomber/services/Service.java b/app/src/main/java/com/dm/bomber/services/Service.java
@@ -42,7 +42,8 @@ public static String format(String phone, String mask) {
 
         int index = 0;
         for (char symbol : mask.toCharArray())
-            formattedPhone.append(symbol == '*' ? phone.charAt(index++) : symbol);
+            if (index < phone.length())
+                formattedPhone.append(symbol == '*' ? phone.charAt(index++) : symbol);
 
         return formattedPhone.toString();
     }