public AnalysisNetworkRequestResult(@NonNull final T giniCaptureDocument,
@NonNull final String apiDocumentId,
+ @NonNull final String apiDocumentFilename,
@NonNull final AnalysisResult analysisResult) {
- super(giniCaptureDocument, apiDocumentId);
+ super(giniCaptureDocument, apiDocumentId, apiDocumentFilename);
mAnalysisResult = analysisResult;
}
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/network/NetworkRequestResult.java b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/network/NetworkRequestResult.java
index cb3878116..2229307a1 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/network/NetworkRequestResult.java
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/network/NetworkRequestResult.java
@@ -6,7 +6,7 @@
/**
* Created by Alpar Szotyori on 16.04.2018.
- *
+ *
* Copyright (c) 2018 Gini GmbH.
*/
@@ -19,11 +19,14 @@ public class NetworkRequestResult {
private final T mGiniCaptureDocument;
private final String mApiDocumentId;
+ private final String mApiDocumentFilename;
public NetworkRequestResult(@NonNull final T giniCaptureDocument,
- @NonNull final String apiDocumentId) {
+ @NonNull final String apiDocumentId,
+ @NonNull final String apiDocumentFilename) {
mGiniCaptureDocument = giniCaptureDocument;
mApiDocumentId = apiDocumentId;
+ mApiDocumentFilename = apiDocumentFilename;
}
@NonNull
@@ -35,4 +38,9 @@ public T getGiniCaptureDocument() {
public String getApiDocumentId() {
return mApiDocumentId;
}
+
+ @NonNull
+ public String getApiDocumentFilename() {
+ return mApiDocumentFilename;
+ }
}
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/network/NetworkRequestsManager.java b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/network/NetworkRequestsManager.java
index 151bb252e..95b7d3d24 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/network/NetworkRequestsManager.java
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/internal/network/NetworkRequestsManager.java
@@ -233,7 +233,8 @@ public void success(final Result result) {
mApiDocumentIds.put(document.getId(),
result.getGiniApiDocumentId());
future.complete(new NetworkRequestResult<>(document,
- result.getGiniApiDocumentId()));
+ result.getGiniApiDocumentId(),
+ result.getGiniApiDocumentFilename()));
}
@Override
@@ -404,7 +405,8 @@ public void success(final Result result) {
document.getId());
future.complete(
new NetworkRequestResult<>(document,
- result.getGiniApiDocumentId()));
+ result.getGiniApiDocumentId(),
+ result.getGiniApiDocumentFilename()));
}
@Override
@@ -519,8 +521,12 @@ public void success(
mApiDocumentIds.put(multiPageDocument.getId(),
result.getGiniApiDocumentId());
future.complete(
- new AnalysisNetworkRequestResult<>(multiPageDocument,
- result.getGiniApiDocumentId(), result));
+ new AnalysisNetworkRequestResult<>(
+ multiPageDocument,
+ result.getGiniApiDocumentId(),
+ result.getGiniApiDocumentFilename(),
+ result)
+ );
}
@Override
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/network/AnalysisResult.java b/capture-sdk/sdk/src/main/java/net/gini/android/capture/network/AnalysisResult.java
index 0cabf3791..597dfb77d 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/network/AnalysisResult.java
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/network/AnalysisResult.java
@@ -12,7 +12,7 @@
/**
* Created by Alpar Szotyori on 29.01.2018.
- *
+ *
* Copyright (c) 2018 Gini GmbH.
*/
@@ -31,9 +31,11 @@ public class AnalysisResult extends Result {
* @param giniApiDocumentId the id of a document in the Gini API
* @param extractions the extractions from the Gini API
*/
- public AnalysisResult(@NonNull final String giniApiDocumentId,
+ public AnalysisResult(
+ @NonNull final String giniApiDocumentId,
+ @NonNull final String giniApiDocumentFilename,
@NonNull final Map extractions) {
- super(giniApiDocumentId);
+ super(giniApiDocumentId, giniApiDocumentFilename);
this.extractions = extractions;
this.compoundExtractions = Collections.emptyMap();
this.returnReasons = Collections.emptyList();
@@ -42,14 +44,15 @@ public AnalysisResult(@NonNull final String giniApiDocumentId,
/**
* Create a new analysis result for a Gini API document id.
*
- * @param giniApiDocumentId the id of a document in the Gini API
- * @param extractions the extractions from the Gini API
+ * @param giniApiDocumentId the id of a document in the Gini API
+ * @param extractions the extractions from the Gini API
* @param compoundExtractions the compound extractions from the Gini API
*/
public AnalysisResult(@NonNull final String giniApiDocumentId,
+ @NonNull final String giniApiDocumentFilename,
@NonNull final Map extractions,
@NonNull final Map compoundExtractions) {
- super(giniApiDocumentId);
+ super(giniApiDocumentId, giniApiDocumentFilename);
this.extractions = extractions;
this.compoundExtractions = compoundExtractions;
this.returnReasons = Collections.emptyList();
@@ -58,15 +61,16 @@ public AnalysisResult(@NonNull final String giniApiDocumentId,
/**
* Create a new analysis result for a Gini API document id.
*
- * @param giniApiDocumentId the id of a document in the Gini API
- * @param extractions the extractions from the Gini API
+ * @param giniApiDocumentId the id of a document in the Gini API
+ * @param extractions the extractions from the Gini API
* @param compoundExtractions the compound extractions from the Gini API
*/
public AnalysisResult(@NonNull final String giniApiDocumentId,
+ @NonNull final String giniApiDocumentFilename,
@NonNull final Map extractions,
@NonNull final Map compoundExtractions,
@NonNull final List returnReasons) {
- super(giniApiDocumentId);
+ super(giniApiDocumentId, giniApiDocumentFilename);
this.extractions = extractions;
this.compoundExtractions = compoundExtractions;
this.returnReasons = returnReasons;
diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/network/Result.java b/capture-sdk/sdk/src/main/java/net/gini/android/capture/network/Result.java
index 7efd8a0ed..13639d910 100644
--- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/network/Result.java
+++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/network/Result.java
@@ -12,14 +12,16 @@
public class Result {
private final String giniApiDocumentId;
+ private final String giniApiDocumentFilename;
/**
* Create a new result with a Gini API document id.
*
* @param giniApiDocumentId the id of a document in the Gini API
*/
- public Result(final String giniApiDocumentId) {
+ public Result(final String giniApiDocumentId, final String giniApiDocumentFilename) {
this.giniApiDocumentId = giniApiDocumentId;
+ this.giniApiDocumentFilename = giniApiDocumentFilename;
}
/**
@@ -28,4 +30,8 @@ public Result(final String giniApiDocumentId) {
public String getGiniApiDocumentId() {
return giniApiDocumentId;
}
+
+ public String getGiniApiDocumentFilename() {
+ return giniApiDocumentFilename;
+ }
}
diff --git a/capture-sdk/sdk/src/test/java/net/gini/android/capture/analysis/AnalysisInteractorTest.java b/capture-sdk/sdk/src/test/java/net/gini/android/capture/analysis/AnalysisInteractorTest.java
index 828b68bfe..81f0304f9 100644
--- a/capture-sdk/sdk/src/test/java/net/gini/android/capture/analysis/AnalysisInteractorTest.java
+++ b/capture-sdk/sdk/src/test/java/net/gini/android/capture/analysis/AnalysisInteractorTest.java
@@ -221,7 +221,9 @@ public void should_completeWithNoExtractions_whenAnalysisSucceeded_withoutExtrac
final GiniCaptureMultiPageDocument
multiPageDocument = mock(GiniCaptureMultiPageDocument.class);
- final AnalysisResult analysisResult = new AnalysisResult("apiDocumentId",
+ final AnalysisResult analysisResult = new AnalysisResult(
+ "apiDocumentId",
+ "apiDocumentFilename",
Collections.emptyMap());
final NetworkRequestsManager networkRequestsManager = createtNetworkRequestsManager(
@@ -272,6 +274,7 @@ public void should_completeWithExtractions_whenAnalysisSucceeded_withExtractions
extractions.put("paymentReference", mock(GiniCaptureSpecificExtraction.class));
final AnalysisResult analysisResult = new AnalysisResult("apiDocumentId",
+ "apiDocumentFilename",
extractions);
final NetworkRequestsManager networkRequestsManager = createtNetworkRequestsManager(