- Fix upload response status parsing

Author: pstorch

app/build.gradle

@@ -36,8 +36,8 @@ android {
         applicationId "de.bahnhoefe.deutschlands.bahnhofsfotos"
         minSdk 26
         targetSdk 33
-        versionCode 77
-        versionName "14.4.0"
+        versionCode 78
+        versionName "14.4.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 
@@ -131,7 +131,7 @@ dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.browser:browser:1.5.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'

app/src/main/java/de/bahnhoefe/deutschlands/bahnhofsfotos/ProblemReportActivity.java

@@ -210,9 +210,11 @@ public void onResponse(@NonNull Call<InboxResponse> call, @NonNull Response<Inbo
                         upload.setRemoteId(inboxResponse.getId());
                         upload.setUploadState(inboxResponse.getState().getUploadState());
                         baseApplication.getDbAdapter().updateUpload(upload);
-                        SimpleDialogs.confirmOk(ProblemReportActivity.this, inboxResponse.getState().getMessageId());
-                        if (response.isSuccessful()) {
-                            finish();
+                        if (inboxResponse.getState() == InboxResponse.InboxResponseState.ERROR) {
+                            SimpleDialogs.confirmOk(ProblemReportActivity.this,
+                                    getString(InboxResponse.InboxResponseState.ERROR.getMessageId(), inboxResponse.getMessage()));
+                        } else {
+                            SimpleDialogs.confirmOk(ProblemReportActivity.this, inboxResponse.getState().getMessageId());
                         }
                     }
 

app/src/main/kotlin/de/bahnhoefe/deutschlands/bahnhofsfotos/model/InboxResponse.kt

@@ -4,11 +4,12 @@ import com.google.gson.JsonDeserializationContext
 import com.google.gson.JsonDeserializer
 import com.google.gson.JsonElement
 import com.google.gson.annotations.JsonAdapter
+import com.google.gson.annotations.SerializedName
 import de.bahnhoefe.deutschlands.bahnhofsfotos.R
 import java.lang.reflect.Type
 
 data class InboxResponse @JvmOverloads constructor(
-    var _state: InboxResponseState? = InboxResponseState.ERROR,
+    @SerializedName("state") var _state: InboxResponseState? = InboxResponseState.ERROR,
     var message: String? = null,
     var id: Long? = null,
     var filename: String? = null,

app/src/test/java/de/bahnhoefe/deutschlands/bahnhofsfotos/model/InboxResponseTest.java

@@ -2,6 +2,8 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import com.google.gson.Gson;
+
 import org.junit.jupiter.api.Test;
 
 class InboxResponseTest {
@@ -27,4 +29,20 @@ void defaultConstructorWithState() {
         assertThat(inboxResponse.getState()).isSameAs(InboxResponse.InboxResponseState.REVIEW);
     }
 
+    @Test
+    void fromJsonWithoutState() {
+        var inboxResponse = new Gson().fromJson("{'message':'some message'}", InboxResponse.class);
+
+        assertThat(inboxResponse.getState()).isSameAs(InboxResponse.InboxResponseState.ERROR);
+        assertThat(inboxResponse.getMessage()).isEqualTo("some message");
+    }
+
+    @Test
+    void fromJsonWithState() {
+        var inboxResponse = new Gson().fromJson("{'state': 'REVIEW', 'message':'some message'}", InboxResponse.class);
+
+        assertThat(inboxResponse.getState()).isSameAs(InboxResponse.InboxResponseState.REVIEW);
+        assertThat(inboxResponse.getMessage()).isEqualTo("some message");
+    }
+
 }

fastlane/metadata/android/de-DE/changelogs/78.txt

@@ -0,0 +1 @@
+- Fehler beim interpretieren des Upload Status

fastlane/metadata/android/en-US/changelogs/78.txt

@@ -0,0 +1 @@
+- Fix upload response status parsing