From 5c7528dbcffdd1566f009c88bab9356f4abe5c9a Mon Sep 17 00:00:00 2001
From: valfieri <vittorio.alfieri@leonardocompany.com>
Date: Tue, 3 Sep 2019 14:04:07 +0200
Subject: [PATCH] Fix timeout on image database download.

---
 .../src/org/libsdl/app/SDLActivity.java       | 41 ++++++++-----------
 1 file changed, 18 insertions(+), 23 deletions(-)

diff --git a/projects/mtg/Android/src/org/libsdl/app/SDLActivity.java b/projects/mtg/Android/src/org/libsdl/app/SDLActivity.java
index 8b3455ef3..5ad421192 100644
--- a/projects/mtg/Android/src/org/libsdl/app/SDLActivity.java
+++ b/projects/mtg/Android/src/org/libsdl/app/SDLActivity.java
@@ -365,7 +365,6 @@ public class SDLActivity extends Activity implements OnKeyListener {
     boolean[] checkedSet;
     Integer totalset = 0;
     boolean finished = false;
-    boolean finished2 = false;
     boolean loadResInProgress = false;
     ProgressDialog progressBarDialogRes;
     boolean fast = false;
@@ -423,19 +422,14 @@ public class SDLActivity extends Activity implements OnKeyListener {
                 progressBarDialogRes.dismiss();
                 mHandler.post(new Runnable() {
                     public void run() {
-                        while (!finished || !finished2) {
+                        while (!finished) {
                             try {
-                                Thread.sleep(5000);
+                                Thread.sleep(1000);
                             } catch (Exception e) {
                             }
                         }
                         selectedSets = new ArrayList<String>();
-                        if(!fast) {
-                            showWarningFast();
-                        }
-                        else {
-                            downloadCardImages();
-                        }
+                        showWarningFast();
                     }
                 });
             }
@@ -444,7 +438,6 @@ public class SDLActivity extends Activity implements OnKeyListener {
         new Thread(new Runnable() {
             public void run() {
                 fast = ImgDownloader.loadDatabase(getSystemStorageLocation());
-                finished2 = true;
             }
         }).start();
 
@@ -453,8 +446,21 @@ public class SDLActivity extends Activity implements OnKeyListener {
 
     private void showWarningFast() {
         AlertDialog.Builder infoDialog = new AlertDialog.Builder(this);
-        infoDialog.setTitle("Problem downloading the images database file");
-        infoDialog.setMessage("The program will use the slow method (not indexed), so the images download may take really long time...");
+        if(!fast) {
+            infoDialog.setTitle("Problem downloading the images database file");
+            infoDialog.setMessage("The program will use the slow (not indexed) method, so the images download may take really long time...");
+
+            infoDialog.setNegativeButton("Retry", new DialogInterface.OnClickListener() {
+                public void onClick(DialogInterface dialog, int id) {
+                    fast = ImgDownloader.loadDatabase(getSystemStorageLocation());
+                    showWarningFast();
+                }
+            });
+        }
+        else {
+            infoDialog.setTitle("Images Database correctly downloaded");
+            infoDialog.setMessage("The program will use the fast (indexed) method, so the images download will not take long time!");
+        }
 
         infoDialog.setPositiveButton("Continue", new DialogInterface.OnClickListener() {
             public void onClick(DialogInterface dialog, int id) {
@@ -462,17 +468,6 @@ public class SDLActivity extends Activity implements OnKeyListener {
             }
         });
 
-        infoDialog.setNegativeButton("Retry", new DialogInterface.OnClickListener() {
-            public void onClick(DialogInterface dialog, int id) {
-                fast = ImgDownloader.loadDatabase(getSystemStorageLocation());
-                if(fast){
-                    downloadCardImages();
-                } else {
-                    showWarningFast();
-                }
-            }
-        });
-
         infoDialog.create().show();
     }