add receipt auto download config parameter

Author: ajungg

core/src/main/java/io/snabble/sdk/Checkout.java

@@ -319,10 +319,7 @@ private boolean handleProcessResponse() {
 
         String receiptLink = checkoutProcess.getReceiptLink();
         if (receiptLink != null) {
-            PriceFormatter priceFormatter = new PriceFormatter(project);
-            receipts.download(project, receiptLink,
-                    project.getCheckedInShop().getName(),
-                    priceFormatter.format(priceToPay), null);
+            downloadReceipt(receiptLink);
 
             if (paymentMethod.isOfflineMethod()) {
                 return true;
@@ -351,6 +348,17 @@ private boolean handleProcessResponse() {
         return false;
     }
 
+    private void downloadReceipt(String receiptLink) {
+        PriceFormatter priceFormatter = new PriceFormatter(project);
+        ReceiptInfo receiptInfo = receipts.add(project, receiptLink,
+                project.getCheckedInShop().getName(),
+                priceFormatter.format(priceToPay));
+
+        if(Snabble.getInstance().getConfig().enableReceiptAutoDownload) {
+            receipts.download(receiptInfo, null);
+        }
+    }
+
     private void scheduleNextPollForReceipt() {
         handler.postDelayed(pollForReceiptRunnable, 2000);
     }
@@ -363,9 +371,7 @@ private void pollForReceipt() {
             public void success(CheckoutApi.CheckoutProcessResponse checkoutProcessResponse) {
                 String receiptLink = checkoutProcessResponse.getReceiptLink();
                 if (receiptLink != null) {
-                    PriceFormatter priceFormatter = new PriceFormatter(project);
-                    receipts.download(project, receiptLink, project.getCheckedInShop().getName(),
-                            priceFormatter.format(priceToPay), null);
+                    downloadReceipt(receiptLink);
                 } else {
                     scheduleNextPollForReceipt();
                 }

core/src/main/java/io/snabble/sdk/Receipts.java

@@ -91,52 +91,46 @@ public void cancelDownload(final ReceiptInfo receiptInfo) {
         receiptInfo.call = null;
     }
 
+    ReceiptInfo add(final Project project,
+                    final String url,
+                    final String shopName,
+                    final String price) {
+        final String absoluteUrl = Snabble.getInstance().absoluteUrl(url);
+        final String id = Utils.sha1Hex(absoluteUrl);
+
+        ReceiptInfo receiptInfo = new ReceiptInfo(id, project.getId(), absoluteUrl, shopName, price);
+        receiptInfo.setProject(project);
+        saveReceiptInfo(receiptInfo);
+
+        return receiptInfo;
+    }
+
+    /**
+     * Downloads a receipts pdf and stores it in the projects internal storage directory.
+     */
     public void download(final ReceiptInfo receiptInfo,
                          final ReceiptDownloadCallback callback) {
         if (receiptInfo.isDownloaded()) {
             callback.success(receiptInfo);
             return;
         }
 
-        download(receiptInfo.getProject(),
-                receiptInfo.getUrl(),
-                receiptInfo.getShopName(),
-                receiptInfo.getPrice(), callback);
-    }
-
-    public void download(final Project project,
-                         final String url,
-                         final String shopName,
-                         final String price,
-                         final ReceiptDownloadCallback callback) {
-        if (url == null || project == null) {
+        if (receiptInfo.getUrl() == null || receiptInfo.getProject() == null) {
             callback.failure();
             return;
         }
 
-        final String absoluteUrl = Snabble.getInstance().absoluteUrl(url);
-        final String id = Utils.sha1Hex(absoluteUrl);
-
-        ReceiptInfo receiptInfo = receiptInfoList.get(id);
-
-        if (receiptInfo == null) {
-            receiptInfo = new ReceiptInfo(id, project.getId(), absoluteUrl, shopName, price);
-            receiptInfo.setProject(project);
-        }
-
-        final ReceiptInfo finalReceiptInfo = receiptInfo;
-
         final Request request = new Request.Builder()
-                .url(absoluteUrl)
+                .url(receiptInfo.getUrl())
                 .get()
                 .build();
 
-        Call call = project.getOkHttpClient().newCall(request);
+        Call call = receiptInfo.getProject().getOkHttpClient().newCall(request);
         call.enqueue(new Callback() {
             @Override
             public void onResponse(Call call, Response response) throws IOException {
                 if (response.isSuccessful()) {
-                    finalReceiptInfo.call = null;
+                    receiptInfo.call = null;
 
                     ResponseBody body = response.body();
                     if (body == null) {
@@ -147,14 +141,14 @@ public void onResponse(Call call, Response response) throws IOException {
                     }
 
                     // .pdf extension is needed for adobe reader to work
-                    File file = new File(storageDirectory, finalReceiptInfo.getId() + ".pdf");
+                    File file = new File(storageDirectory, receiptInfo.getId() + ".pdf");
                     FileOutputStream fos = new FileOutputStream(file);
                     IOUtils.copy(body.byteStream(), fos);
-                    finalReceiptInfo.setFilePath(file.getAbsolutePath());
-                    saveReceiptInfo(finalReceiptInfo);
+                    receiptInfo.setFilePath(file.getAbsolutePath());
+                    saveReceiptInfo(receiptInfo);
 
                     if (callback != null) {
-                        callback.success(finalReceiptInfo);
+                        callback.success(receiptInfo);
                     }
                 } else {
                     if (callback != null) {

core/src/main/java/io/snabble/sdk/Snabble.java

@@ -411,6 +411,12 @@ public static class Config {
          * Note that this increases setup time of the ProductDatabase, and it may not be
          * immediately available offline.
          */
-        public boolean generateSearchIndex = false;
+        public boolean generateSearchIndex;
+
+        /**
+         * If set to true, downloads receipts automatically and stores them in the projects
+         * internal storage folder.
+         */
+        public boolean enableReceiptAutoDownload;
     }
 }