From ef4b18b394dbe696a18106e77bfdb519779989da Mon Sep 17 00:00:00 2001 From: valfieri Date: Mon, 26 Aug 2019 19:30:58 +0200 Subject: [PATCH] Fix on UST set for Android Downloader and fix on StopDownload action. --- .../src/net/wagic/utils/ImgDownloader.java | 396 +++++++++--------- .../src/org/libsdl/app/SDLActivity.java | 42 +- 2 files changed, 230 insertions(+), 208 deletions(-) diff --git a/projects/mtg/Android/src/net/wagic/utils/ImgDownloader.java b/projects/mtg/Android/src/net/wagic/utils/ImgDownloader.java index a15e9938d..fae49b0d1 100644 --- a/projects/mtg/Android/src/net/wagic/utils/ImgDownloader.java +++ b/projects/mtg/Android/src/net/wagic/utils/ImgDownloader.java @@ -28,6 +28,7 @@ import java.util.stream.Stream; import android.graphics.*; import android.app.ProgressDialog; +import org.libsdl.app.SDLActivity; public class ImgDownloader { @@ -142,204 +143,204 @@ public class ImgDownloader { return name + " (" + totalcards + " cards)"; } - public static String getSpecialCardUrl(String id){ + public static String getSpecialCardUrl(String id) { String cardurl = ""; - if(id.equals("15208711")) + if (id.equals("15208711")) cardurl = "https://img.scryfall.com/cards/large/front/9/c/9c138bf9-8be6-4f1a-a82c-a84938ab84f5.jpg?1562279137"; - else if(id.equals("15208712")) + else if (id.equals("15208712")) cardurl = "https://img.scryfall.com/cards/normal/front/d/4/d453ee89-6122-4d51-989c-e78b046a9de3.jpg?1561758141"; - else if(id.equals("2050321")) + else if (id.equals("2050321")) cardurl = "https://img.scryfall.com/cards/large/front/1/8/18b9c83d-4422-4b95-9fc2-070ed6b5bdf6.jpg?1562701921"; - else if(id.equals("2050322")) + else if (id.equals("2050322")) cardurl = "https://crystal-cdn4.crystalcommerce.com/photos/504053/ooze_token_b.jpg"; - else if(id.equals("22010012")) + else if (id.equals("22010012")) cardurl = "https://img.scryfall.com/cards/normal/front/8/4/84dc847c-7a37-4c7f-b02c-30b3e4c91fb6.jpg?1561757490"; - else if(id.equals("8759611")) + else if (id.equals("8759611")) cardurl = "https://img.scryfall.com/cards/large/front/4/1/41004bdf-8e09-4b2c-9e9c-26c25eac9854.jpg?1562493483"; - else if(id.equals("8759911")) + else if (id.equals("8759911")) cardurl = "https://img.scryfall.com/cards/large/front/0/b/0b61d772-2d8b-4acf-9dd2-b2e8b03538c8.jpg?1562492461"; - else if(id.equals("8759511")) + else if (id.equals("8759511")) cardurl = "https://img.scryfall.com/cards/large/front/d/2/d224c50f-8146-4c91-9401-04e5bd306d02.jpg?1562496100"; - else if(id.equals("8471611")) + else if (id.equals("8471611")) cardurl = "https://img.scryfall.com/cards/png/front/8/4/84920a21-ee2a-41ac-a369-347633d10371.png?1562494702"; - else if(id.equals("8760011")) + else if (id.equals("8760011")) cardurl = "https://img.scryfall.com/cards/large/front/4/2/42ba0e13-d20f-47f9-9c86-2b0b13c39ada.jpg?1562493487"; - else if(id.equals("401721")) + else if (id.equals("401721")) cardurl = "https://deckmaster.info/images/cards/DDP/401721-hr.jpg"; - else if(id.equals("401722")) + else if (id.equals("401722")) cardurl = "https://deckmaster.info/images/cards/DDP/401722-hr.jpg"; - else if(id.equals("19784311")) + else if (id.equals("19784311")) cardurl = "https://deckmaster.info/images/cards/AKH/-4173-hr.jpg"; - else if(id.equals("19784312")) + else if (id.equals("19784312")) cardurl = "https://deckmaster.info/images/cards/BNG/-10-hr.jpg"; - else if(id.equals("19784313")) + else if (id.equals("19784313")) cardurl = "https://deckmaster.info/images/cards/DDD/201843-hr.jpg"; - else if(id.equals("20787512")) + else if (id.equals("20787512")) cardurl = "https://deckmaster.info/images/cards/SOM/-227-hr.jpg"; - else if(id.equals("20787511")) + else if (id.equals("20787511")) cardurl = "https://deckmaster.info/images/cards/SOM/-226-hr.jpg"; - else if(id.equals("11492111")) + else if (id.equals("11492111")) cardurl = "https://deckmaster.info/images/cards/TSP/-2841-hr.jpg"; - else if(id.equals("11492112")) + else if (id.equals("11492112")) cardurl = "https://deckmaster.info/images/cards/TSP/-2840-hr.jpg"; - else if(id.equals("11492113")) + else if (id.equals("11492113")) cardurl = "https://img.scryfall.com/cards/large/front/5/b/5b9f471a-1822-4981-95a9-8923d83ddcbf.jpg?1562702075"; - else if(id.equals("11492114")) + else if (id.equals("11492114")) cardurl = "https://deckmaster.info/images/cards/DDN/386322-hr.jpg"; - else if(id.equals("11492115") || id.equals("209162")) + else if (id.equals("11492115") || id.equals("209162")) cardurl = "https://deckmaster.info/images/cards/DDE/209162-hr.jpg"; - else if(id.equals("7448911")) + else if (id.equals("7448911")) cardurl = "https://img.scryfall.com/cards/large/front/c/a/ca03131a-9bd4-4fba-b95c-90f1831e86e7.jpg?1562879774"; - else if(id.equals("7453611")) + else if (id.equals("7453611")) cardurl = "https://img.scryfall.com/cards/large/front/7/3/73636ca0-2309-4bb3-9300-8bd0c0bb5b31.jpg?1562877808"; - else if(id.equals("7447611")) + else if (id.equals("7447611")) cardurl = "https://img.scryfall.com/cards/large/front/2/8/28f72260-c8f9-4c44-92b5-23cef6690fdd.jpg?1562876119"; - else if(id.equals("7467111")) + else if (id.equals("7467111")) cardurl = "https://img.scryfall.com/cards/large/front/1/f/1fe2b76f-ddb7-49d5-933b-ccb06be5d46f.jpg?1562875903"; - else if(id.equals("7409311")) + else if (id.equals("7409311")) cardurl = "https://img.scryfall.com/cards/large/front/7/5/758abd53-6ad2-406e-8615-8e48678405b4.jpg?1562877848"; - else if(id.equals("3896122")) + else if (id.equals("3896122")) cardurl = "https://img.scryfall.com/cards/large/front/5/9/59a00cac-53ae-46ad-8468-e6d1db40b266.jpg?1562542382"; - else if(id.equals("3896522")) + else if (id.equals("3896522")) cardurl = "https://www.cardkingdom.com/images/magic-the-gathering/masters-25/whale-token-42707-medium.jpg"; - else if(id.equals("3896521")) + else if (id.equals("3896521")) cardurl = "https://www.cardkingdom.com/images/magic-the-gathering/commander-2014/fish-token-zombie-token-blue-53462-medium.jpg"; - else if(id.equals("3896523")) + else if (id.equals("3896523")) cardurl = "https://img.scryfall.com/cards/large/front/d/0/d0cd85cc-ad22-446b-8378-5eb69fee1959.jpg?1562840712"; - else if(id.equals("687701")) + else if (id.equals("687701")) cardurl = "https://deckmaster.info/images/cards/DKM/-2437-hr.jpg"; - else if(id.equals("687702")) + else if (id.equals("687702")) cardurl = "https://deckmaster.info/images/cards/DKM/-3069-hr.jpg"; - else if(id.equals("687703")) + else if (id.equals("687703")) cardurl = "https://deckmaster.info/images/cards/DKM/-2443-hr.jpg"; - else if(id.equals("687704")) + else if (id.equals("687704")) cardurl = "https://deckmaster.info/images/cards/DKM/-2444-hr.jpg"; - else if(id.equals("687705")) + else if (id.equals("687705")) cardurl = "https://deckmaster.info/images/cards/DKM/-2450-hr.jpg"; - else if(id.equals("687713")) + else if (id.equals("687713")) cardurl = "https://deckmaster.info/images/cards/DKM/-3175-hr.jpg"; - else if(id.equals("687712")) + else if (id.equals("687712")) cardurl = "https://deckmaster.info/images/cards/DKM/-2624-hr.jpg"; - else if(id.equals("687711")) + else if (id.equals("687711")) cardurl = "https://deckmaster.info/images/cards/DKM/-3168-hr.jpg"; - else if(id.equals("687710")) + else if (id.equals("687710")) cardurl = "https://deckmaster.info/images/cards/DKM/-3161-hr.jpg"; - else if(id.equals("687709")) + else if (id.equals("687709")) cardurl = "https://deckmaster.info/images/cards/DKM/-2485-hr.jpg"; - else if(id.equals("687752")) + else if (id.equals("687752")) cardurl = "https://deckmaster.info/images/cards/DKM/-3085-hr.jpg"; - else if(id.equals("687707")) + else if (id.equals("687707")) cardurl = "https://deckmaster.info/images/cards/DKM/-2478-hr.jpg"; - else if(id.equals("687751")) + else if (id.equals("687751")) cardurl = "https://deckmaster.info/images/cards/DKM/-3083-hr.jpg"; - else if(id.equals("687720")) + else if (id.equals("687720")) cardurl = "https://deckmaster.info/images/cards/DKM/-2652-hr.jpg"; - else if(id.equals("687719")) + else if (id.equals("687719")) cardurl = "https://deckmaster.info/images/cards/DKM/-2650-hr.jpg"; - else if(id.equals("687718")) + else if (id.equals("687718")) cardurl = "https://deckmaster.info/images/cards/DKM/-3178-hr.jpg"; - else if(id.equals("687717")) + else if (id.equals("687717")) cardurl = "https://deckmaster.info/images/cards/DKM/-2641-hr.jpg"; - else if(id.equals("687716")) + else if (id.equals("687716")) cardurl = "https://deckmaster.info/images/cards/DKM/-2634-hr.jpg"; - else if(id.equals("687715")) + else if (id.equals("687715")) cardurl = "https://deckmaster.info/images/cards/DKM/-2631-hr.jpg"; - else if(id.equals("687714")) + else if (id.equals("687714")) cardurl = "https://deckmaster.info/images/cards/DKM/-2630-hr.jpg"; - else if(id.equals("687722")) + else if (id.equals("687722")) cardurl = "https://deckmaster.info/images/cards/DKM/-2550-hr.jpg"; - else if(id.equals("687721")) + else if (id.equals("687721")) cardurl = "https://deckmaster.info/images/cards/DKM/-3183-hr.jpg"; - else if(id.equals("687734")) + else if (id.equals("687734")) cardurl = "https://deckmaster.info/images/cards/DKM/-2398-hr.jpg"; - else if(id.equals("687708")) + else if (id.equals("687708")) cardurl = "https://deckmaster.info/images/cards/DKM/-3086-hr.jpg"; - else if(id.equals("687732")) + else if (id.equals("687732")) cardurl = "https://deckmaster.info/images/cards/DKM/-3158-hr.jpg"; - else if(id.equals("687731")) + else if (id.equals("687731")) cardurl = "https://deckmaster.info/images/cards/DKM/-3157-hr.jpg"; - else if(id.equals("687755")) + else if (id.equals("687755")) cardurl = "https://deckmaster.info/images/cards/DKM/-3156-hr.jpg"; - else if(id.equals("687730")) + else if (id.equals("687730")) cardurl = "https://deckmaster.info/images/cards/DKM/-2603-hr.jpg"; - else if(id.equals("687729")) + else if (id.equals("687729")) cardurl = "https://deckmaster.info/images/cards/DKM/-2576-hr.jpg"; - else if(id.equals("687728")) + else if (id.equals("687728")) cardurl = "https://deckmaster.info/images/cards/DKM/-2573-hr.jpg"; - else if(id.equals("687727")) + else if (id.equals("687727")) cardurl = "https://deckmaster.info/images/cards/DKM/-2570-hr.jpg"; - else if(id.equals("687726")) + else if (id.equals("687726")) cardurl = "https://deckmaster.info/images/cards/DKM/-2568-hr.jpg"; - else if(id.equals("687725")) + else if (id.equals("687725")) cardurl = "https://deckmaster.info/images/cards/DKM/-2559-hr.jpg"; - else if(id.equals("687724")) + else if (id.equals("687724")) cardurl = "https://deckmaster.info/images/cards/DKM/-3131-hr.jpg"; - else if(id.equals("687723")) + else if (id.equals("687723")) cardurl = "https://deckmaster.info/images/cards/DKM/-3128-hr.jpg"; - else if(id.equals("687740")) + else if (id.equals("687740")) cardurl = "https://deckmaster.info/images/cards/DKM/-2759-hr.jpg"; - else if(id.equals("687739")) + else if (id.equals("687739")) cardurl = "https://deckmaster.info/images/cards/DKM/-2755-hr.jpg"; - else if(id.equals("687738")) + else if (id.equals("687738")) cardurl = "https://deckmaster.info/images/cards/DKM/-2432-hr.jpg"; - else if(id.equals("687737")) + else if (id.equals("687737")) cardurl = "https://deckmaster.info/images/cards/DKM/-3053-hr.jpg"; - else if(id.equals("687756")) + else if (id.equals("687756")) cardurl = "https://deckmaster.info/images/cards/DKM/-3054-hr.jpg"; - else if(id.equals("687736")) + else if (id.equals("687736")) cardurl = "https://deckmaster.info/images/cards/DKM/-2408-hr.jpg"; - else if(id.equals("687735")) + else if (id.equals("687735")) cardurl = "https://deckmaster.info/images/cards/DKM/-2403-hr.jpg"; - else if(id.equals("687733")) + else if (id.equals("687733")) cardurl = "https://deckmaster.info/images/cards/DKM/-2729-hr.jpg"; - else if(id.equals("687706")) + else if (id.equals("687706")) cardurl = "https://deckmaster.info/images/cards/DKM/-3082-hr.jpg"; - else if(id.equals("687750")) + else if (id.equals("687750")) cardurl = "https://deckmaster.info/images/cards/DKM/-2748-hr.jpg"; - else if(id.equals("687748")) + else if (id.equals("687748")) cardurl = "https://deckmaster.info/images/cards/DKM/-2747-hr.jpg"; - else if(id.equals("687749")) + else if (id.equals("687749")) cardurl = "https://deckmaster.info/images/cards/DKM/-2746-hr.jpg"; - else if(id.equals("687742")) + else if (id.equals("687742")) cardurl = "https://deckmaster.info/images/cards/DKM/-2743-hr.jpg"; - else if(id.equals("687743")) + else if (id.equals("687743")) cardurl = "https://deckmaster.info/images/cards/DKM/-2744-hr.jpg"; - else if(id.equals("687744")) + else if (id.equals("687744")) cardurl = "https://deckmaster.info/images/cards/DKM/-2745-hr.jpg"; - else if(id.equals("687745")) + else if (id.equals("687745")) cardurl = "https://deckmaster.info/images/cards/DKM/-2763-hr.jpg"; - else if(id.equals("687746")) + else if (id.equals("687746")) cardurl = "https://deckmaster.info/images/cards/DKM/-2764-hr.jpg"; - else if(id.equals("687747")) + else if (id.equals("687747")) cardurl = "https://deckmaster.info/images/cards/DKM/-2765-hr.jpg"; - else if(id.equals("687741")) + else if (id.equals("687741")) cardurl = "https://deckmaster.info/images/cards/DKM/-2761-hr.jpg"; - else if(id.equals("687753")) + else if (id.equals("687753")) cardurl = "https://deckmaster.info/images/cards/DKM/-3176-hr.jpg"; - else if(id.equals("687754")) + else if (id.equals("687754")) cardurl = "https://deckmaster.info/images/cards/DKM/-3184-hr.jpg"; - else if(id.equals("7897511")) + else if (id.equals("7897511")) cardurl = "https://img.scryfall.com/cards/large/front/a/4/a4f4aa3b-c64a-4430-b1a2-a7fca87d0a22.jpg?1562763433"; - else if(id.equals("7868811")) + else if (id.equals("7868811")) cardurl = "https://img.scryfall.com/cards/large/front/b/3/b3523b8e-065f-427c-8d5b-eb731ca91ede.jpg?1562763691"; - else if(id.equals("7868711")) + else if (id.equals("7868711")) cardurl = "https://img.scryfall.com/cards/large/front/5/8/58164521-aeec-43fc-9db9-d595432dea6f.jpg?1564694999"; - else if(id.equals("7868611")) + else if (id.equals("7868611")) cardurl = "https://img.scryfall.com/cards/large/front/3/3/33a8e5b9-6bfb-4ff2-a16d-3168a5412807.jpg?1562758927"; - else if(id.equals("7869111")) + else if (id.equals("7869111")) cardurl = "https://img.scryfall.com/cards/large/front/9/d/9de1eebf-5725-438c-bcf0-f3a4d8a89fb0.jpg?1562762993"; - else if(id.equals("7860011")) + else if (id.equals("7860011")) cardurl = "https://img.scryfall.com/cards/large/front/8/6/864ad989-19a6-4930-8efc-bbc077a18c32.jpg?1562762069"; - else if(id.equals("7867911")) + else if (id.equals("7867911")) cardurl = "https://img.scryfall.com/cards/large/front/c/8/c8265c39-d287-4c5a-baba-f2f09dd80a1c.jpg?1562764226"; - else if(id.equals("7867811")) + else if (id.equals("7867811")) cardurl = "https://img.scryfall.com/cards/large/front/a/0/a00a7180-49bd-4ead-852a-67b6b5e4b933.jpg?1564694995"; - else if(id.equals("7869511")) + else if (id.equals("7869511")) cardurl = "https://img.scryfall.com/cards/large/front/f/2/f2ddf1a3-e6fa-4dd0-b80d-1a585b51b934.jpg?1562765664"; - else if(id.equals("7869411")) + else if (id.equals("7869411")) cardurl = "https://img.scryfall.com/cards/large/front/6/e/6ee6cd34-c117-4d7e-97d1-8f8464bfaac8.jpg?1562761096"; - else if(id.equals("207998")) + else if (id.equals("207998")) cardurl = "https://deckmaster.info/images/cards/DDE/207998-hr.jpg"; else if (id.equals("19784555")) cardurl = "https://cdn.shopify.com/s/files/1/0790/8591/products/Grnelementalfinal_800x800.jpg?v=1476398274"; @@ -358,106 +359,106 @@ public class ImgDownloader { return cardurl; } - public static String getSpecialTokenUrl(String id){ + public static String getSpecialTokenUrl(String id) { String tokenurl = ""; - if(id.equals("75291t")) + if (id.equals("75291t")) tokenurl = "http://4.bp.blogspot.com/-y5Fanm3qvrU/Vmd4gGnl2DI/AAAAAAAAAWY/FCrS9FTgOJk/s1600/Tatsumasa%2BToken.jpg"; else if (id.equals("435411t") || id.equals("435410t")) tokenurl = "https://deckmaster.info/images/cards/XLN/-5173-hr.jpg"; - else if(id.equals("202474t") || id.equals("1098t") || id.equals("2024t") || id.equals("3766t") || id.equals("11183t") || id.equals("902t")) + else if (id.equals("202474t") || id.equals("1098t") || id.equals("2024t") || id.equals("3766t") || id.equals("11183t") || id.equals("902t")) tokenurl = "https://deckmaster.info/images/cards/AST/-884-hr.jpg"; - else if(id.equals("202590t") || id.equals("2073t") || id.equals("1027t")) + else if (id.equals("202590t") || id.equals("2073t") || id.equals("1027t")) tokenurl = "https://deckmaster.info/images/cards/AST/-892-hr.jpg"; - else if(id.equals("201124t") || id.equals("3118t")) + else if (id.equals("201124t") || id.equals("3118t")) tokenurl = "http://i1013.photobucket.com/albums/af260/lovesoldier99/STARFISHTOKEN.jpg"; - else if(id.equals("184735") || id.equals("376488t") || id.equals("3066t")) + else if (id.equals("184735") || id.equals("376488t") || id.equals("3066t")) tokenurl = "https://i.pinimg.com/originals/a9/fb/37/a9fb37bdfa8f8013b7eb854d155838e2.jpg"; - else if(id.equals("184598t")) + else if (id.equals("184598t")) tokenurl = "https://deckmaster.info/images/cards/HM/-2070-hr.jpg"; - else if(id.equals("184589t")) + else if (id.equals("184589t")) tokenurl = "http://d1f83aa4yffcdn.cloudfront.net/TOKEN/2%202%20Black%20Zombie.jpg"; - else if(id.equals("184730t")) - tokenurl="https://www.mtg.onl/static/c88f42f8bd5a7c25aa36902546b690f5/4d406/PROXY_Knight_W_1_1.jpg"; - else if(id.equals("1649t") || id.equals("201182t")) + else if (id.equals("184730t")) + tokenurl = "https://www.mtg.onl/static/c88f42f8bd5a7c25aa36902546b690f5/4d406/PROXY_Knight_W_1_1.jpg"; + else if (id.equals("1649t") || id.equals("201182t")) tokenurl = "https://pbs.twimg.com/media/DH9n-2JVwAA0o8z.jpg"; - else if(id.equals("140233t") || id.equals("191239t") || id.equals("205957t")) + else if (id.equals("140233t") || id.equals("191239t") || id.equals("205957t")) tokenurl = "https://i860.photobucket.com/albums/ab170/mistergreen527/White%20Tokens/WAvatarX-X1.jpg"; - else if(id.equals("1686t") || id.equals("2881t") || id.equals("201231t")) + else if (id.equals("1686t") || id.equals("2881t") || id.equals("201231t")) tokenurl = "https://deckmaster.info/images/cards/A25/-5648-hr.jpg"; - else if(id.equals("121261t")) + else if (id.equals("121261t")) tokenurl = "https://i.pinimg.com/originals/a9/fb/37/a9fb37bdfa8f8013b7eb854d155838e2.jpg"; - else if(id.equals("368951t")) + else if (id.equals("368951t")) tokenurl = "https://d1rw89lz12ur5s.cloudfront.net/photo/facetofacegames/file/36262794e9f37368e7872326715ac806/eletok.jpg"; - else if(id.equals("46168t")) + else if (id.equals("46168t")) tokenurl = "https://deckmaster.info/images/cards/KLD/-3287-hr.jpg"; - else if(id.equals("49026t")) + else if (id.equals("49026t")) tokenurl = "https://www.mtg.onl/static/a9d81341e62e39e75075b573739f39d6/4d406/PROXY_Wirefly_2_2.jpg"; - else if(id.equals("414506t")) + else if (id.equals("414506t")) tokenurl = "https://poromagia.com/media/cache/25/f0/25f0cd307adc18d7655c465408267469.jpg"; - else if(id.equals("6142t")) + else if (id.equals("6142t")) tokenurl = "https://cdn.staticneo.com/w/mtg/c/cd/Beast5.jpg"; - else if(id.equals("126166t")) + else if (id.equals("126166t")) tokenurl = "https://deckmaster.info/images/cards/C14/-487-hr.jpg"; - else if(id.equals("136155t")) + else if (id.equals("136155t")) tokenurl = "http://static1.squarespace.com/static/583dca25ff7c5080991b2c87/583de52de6f2e18631eb2b32/58405d0dbe6594762f5bd8e6/1565969982322/wurm-white.jpg"; - else if(id.equals("107091t")) + else if (id.equals("107091t")) tokenurl = "https://media.mtgsalvation.com/attachments/13/534/635032476540667501.jpg"; - else if(id.equals("452760t")) + else if (id.equals("452760t")) tokenurl = "https://deckmaster.info/images/cards/M19/-6036.jpg"; - else if(id.equals("2959t")) + else if (id.equals("2959t")) tokenurl = "https://deckmaster.info/images/cards/HM/-2070-hr.jpg"; - else if(id.equals("380486t")) + else if (id.equals("380486t")) tokenurl = "https://deckmaster.info/images/cards/BNG/-5-hr.jpg"; - else if(id.equals("380487t")) + else if (id.equals("380487t")) tokenurl = "https://poromagia.com/media/cache/25/f0/25f0cd307adc18d7655c465408267469.jpg"; - else if(id.equals("234849t")) + else if (id.equals("234849t")) tokenurl = "https://deckmaster.info/images/cards/RTR/-61-hr.jpg"; - else if(id.equals("23319t")) + else if (id.equals("23319t")) tokenurl = "https://i860.photobucket.com/albums/ab170/mistergreen527/White%20Tokens/WReflectionX-X1.jpg"; - else if(id.equals("205297t") || id.equals("50104t")) + else if (id.equals("205297t") || id.equals("50104t")) tokenurl = "https://www.mtg.onl/static/df30395b530524a3988428d4c0b37161/4d406/PROXY_Pest_0_1.jpg"; - else if(id.equals("3449t")) + else if (id.equals("3449t")) tokenurl = "https://www.mtg.onl/static/8c7fed1a0b8edd97c0fb0ceab24a654f/4d406/PROXY_Goblin_Scout_R_1_1.jpg"; - else if(id.equals("3392t")) + else if (id.equals("3392t")) tokenurl = "https://deckmaster.info/images/cards/DDR/417498-hr.jpg"; - else if(id.equals("3280t")) + else if (id.equals("3280t")) tokenurl = "https://media.mtgsalvation.com/attachments/54/421/635032484680831888.jpg"; - else if(id.equals("3242t")) + else if (id.equals("3242t")) tokenurl = "https://deckmaster.info/images/cards/MI/-2828-hr.jpg"; - else if(id.equals("426025t")) + else if (id.equals("426025t")) tokenurl = "https://cdn.shopify.com/s/files/1/0790/8591/products/Grnelementalfinal_800x800.jpg?v=1476398274"; - else if(id.equals("19878t")) + else if (id.equals("19878t")) tokenurl = "https://www.cardkingdom.com/images/magic-the-gathering/commander-2014/ape-token-zombie-token-blue-65252-medium.jpg"; - else if(id.equals("21381t") || id.equals("40198t")) + else if (id.equals("21381t") || id.equals("40198t")) tokenurl = "https://img.scryfall.com/cards/large/back/8/c/8ce60642-e207-46e6-b198-d803ff3b47f4.jpg?1562921132"; - else if(id.equals("265141t")) + else if (id.equals("265141t")) tokenurl = "https://media.mtgsalvation.com/attachments/102/31/635032498723573408.jpg"; - else if(id.equals("24624t")) + else if (id.equals("24624t")) tokenurl = "https://www.mtg.onl/static/6d717cba653ea9e3f6bd1419741671cb/4d406/PROXY_Minion_B_1_1.jpg"; - else if(id.equals("409810t") || id.equals("409805t") || id.equals("409953t") || id.equals("409997t") || id.equals("410032t")) + else if (id.equals("409810t") || id.equals("409805t") || id.equals("409953t") || id.equals("409997t") || id.equals("410032t")) tokenurl = "https://deckmaster.info/images/cards/SOI/-2404-hr.jpg"; - else if(id.equals("74492t")) + else if (id.equals("74492t")) tokenurl = "https://media.mtgsalvation.com/attachments/94/295/635032496473215708.jpg"; - else if(id.equals("88973t")) + else if (id.equals("88973t")) tokenurl = "https://deckmaster.info/images/cards/DDQ/409655-hr.jpg"; - else if(id.equals("89051t")) + else if (id.equals("89051t")) tokenurl = "https://www.mtg.onl/static/b7625a256e10bcec251a1a0abbf17bd4/4d406/PROXY_Horror_B_4_4.jpg"; - else if(id.equals("5261t")) + else if (id.equals("5261t")) tokenurl = "https://static.cardmarket.com/img/5a0199344cad68eebeefca6fa24e52c3/items/1/MH1/376905.jpg"; - else if(id.equals("116384t") || id.equals("376564t")) + else if (id.equals("116384t") || id.equals("376564t")) tokenurl = "https://deckmaster.info/images/cards/TSP/-114916-hr.jpg"; - else if(id.equals("116383t")) + else if (id.equals("116383t")) tokenurl = "https://i.imgur.com/wRMebWg.jpg"; - else if(id.equals("114917t")) + else if (id.equals("114917t")) tokenurl = "https://deckmaster.info/images/cards/JOU/-43-hr.jpg"; - else if(id.equals("5610t")) + else if (id.equals("5610t")) tokenurl = "https://deckmaster.info/images/cards/DDE/207998-hr.jpg"; - else if(id.equals("185704t")) + else if (id.equals("185704t")) tokenurl = "https://deckmaster.info/images/cards/ZEN/-277-hr.jpg"; - else if(id.equals("461099t")) + else if (id.equals("461099t")) tokenurl = "https://img.scryfall.com/cards/large/front/d/e/de7ba875-f77b-404f-8b75-4ba6f81da410.jpg?1557575978"; - else if(id.equals("9667t")) + else if (id.equals("9667t")) tokenurl = "https://www.mtg.onl/static/abe5178af8ebbe84f5504493a1b5f154/4d406/PROXY_Giant_Chicken_R_4_4.jpg"; else if (id.equals("368549t")) tokenurl = "https://deckmaster.info/images/cards/DDQ/409655-hr.jpg"; @@ -469,51 +470,51 @@ public class ImgDownloader { tokenurl = "https://www.mtg.onl/static/8b684bdea239d594e296a134f5ec1783/4d406/PROXY_Hippo_G_1_1.jpg"; else if (id.equals("111046t")) tokenurl = "https://media.mtgsalvation.com/attachments/32/354/635032480299772645.jpg"; - else if(id.equals("4771t")) + else if (id.equals("4771t")) tokenurl = "https://www.mtg.onl/static/b8060dffbaf67ef987c6324c1523d3e4/4d406/PROXY_Hound_G_1_1.jpg"; - else if(id.equals("3591t")) + else if (id.equals("3591t")) tokenurl = "https://i.pinimg.com/564x/6e/8d/fe/6e8dfeee2919a3efff210df56ab7b85d.jpg"; - else if(id.equals("72858t")) + else if (id.equals("72858t")) tokenurl = "https://www.mtg.onl/static/348314ede9097dd8f6dd018a6502d125/4d406/PROXY_Pincher_2_2.jpg"; - else if(id.equals("3832t")) + else if (id.equals("3832t")) tokenurl = "https://deckmaster.info/images/cards/GK1_DIMIR/-6541-hr.jpg"; - else if(id.equals("426909t") || id.equals("426705t")) + else if (id.equals("426909t") || id.equals("426705t")) tokenurl = "https://img.scryfall.com/cards/large/front/9/8/98956e73-04e4-4d7f-bda5-cfa78eb71350.jpg?1562844807"; - else if(id.equals("426897t")) + else if (id.equals("426897t")) tokenurl = "https://img.scryfall.com/cards/large/front/a/8/a8f339c6-2c0d-4631-849b-44d4360b5131.jpg?1562844814"; - else if(id.equals("175105t")) + else if (id.equals("175105t")) tokenurl = "https://crystal-cdn1.crystalcommerce.com/photos/371742/beast.jpg"; - else if(id.equals("470549t")) + else if (id.equals("470549t")) tokenurl = "https://img.scryfall.com/cards/large/front/7/7/7711a586-37f9-4560-b25d-4fb339d9cd55.jpg?1565299650"; - else if(id.equals("3227t")) + else if (id.equals("3227t")) tokenurl = "https://deckmaster.info/images/cards/PS/-2072-hr.jpg"; - else if(id.equals("3148t")) + else if (id.equals("3148t")) tokenurl = "https://deckmaster.info/images/cards/AL/-2156-hr.jpg"; - else if(id.equals("3113t")) + else if (id.equals("3113t")) tokenurl = "https://www.mtg.onl/static/fca7508d78c26e3daea78fd4640faf9a/4d406/PROXY_Orb_U_X_X.jpg"; - else if(id.equals("26815t")) + else if (id.equals("26815t")) tokenurl = "https://www.mtg.onl/static/8bb68cf125fdcc9d8a21b3dade2f11cb/4d406/PROXY_Cat_B_2_1.jpg"; - else if(id.equals("25956t")) + else if (id.equals("25956t")) tokenurl = "https://www.mtg.onl/static/740ce087c4aff57e881b01c28528c8f9/4d406/PROXY_Kavu_B_3_3.jpg"; - else if(id.equals("74027t")) + else if (id.equals("74027t")) tokenurl = "https://www.mtg.onl/static/48515f01d0fda15dd9308d3a528dae7b/4d406/PROXY_Spirit_W_3_3.jpg"; return tokenurl; } - public static boolean hasToken(String id){ - if(id.equals("456378") || id.equals("2912") || id.equals("1514") || id.equals("364") || id.equals("69") || id.equals("369012") || - id.equals("417759") || id.equals("386476") || id.equals("456371") || id.equals("456360") || id.equals("391958") || id.equals("466959") || - id.equals("466813") || id.equals("201176") || id.equals("202483") || id.equals("3546") || id.equals("425949") || id.equals("426027") || - id.equals("425853") || id.equals("425846") || id.equals("426036") || id.equals("370387") || id.equals("29955") || id.equals("29989") || - id.equals("19741") || id.equals("19722") || id.equals("19706") || id.equals("24597") || id.equals("24617") || id.equals("24563") || - id.equals("253539") || id.equals("277995") || id.equals("265415") || id.equals("289225") || id.equals("289215") || id.equals("253529") || - id.equals("253641") || id.equals("270957") || id.equals("401685") || id.equals("89116") || id.equals("5183") || id.equals("5177") || - id.equals("209289") || id.equals("198171") || id.equals("10419") || id.equals("470542") || id.equals("29992") || id.equals("666") || - id.equals("2026") || id.equals("45395") || id.equals("442021") || id.equals("423758") || id.equals("426930") || id.equals("998") || - id.equals("446163") || id.equals("378411") || id.equals("376457") || id.equals("470749") || id.equals("450641") || id.equals("470623") || - id.equals("470620") || id.equals("470754") || id.equals("470750") || id.equals("470739") || id.equals("470708") || id.equals("470581") || - id.equals("470578") || id.equals("470571") || id.equals("470552")) + public static boolean hasToken(String id) { + if (id.equals("456378") || id.equals("2912") || id.equals("1514") || id.equals("364") || id.equals("69") || id.equals("369012") || + id.equals("417759") || id.equals("386476") || id.equals("456371") || id.equals("456360") || id.equals("391958") || id.equals("466959") || + id.equals("466813") || id.equals("201176") || id.equals("202483") || id.equals("3546") || id.equals("425949") || id.equals("426027") || + id.equals("425853") || id.equals("425846") || id.equals("426036") || id.equals("370387") || id.equals("29955") || id.equals("29989") || + id.equals("19741") || id.equals("19722") || id.equals("19706") || id.equals("24597") || id.equals("24617") || id.equals("24563") || + id.equals("253539") || id.equals("277995") || id.equals("265415") || id.equals("289225") || id.equals("289215") || id.equals("253529") || + id.equals("253641") || id.equals("270957") || id.equals("401685") || id.equals("89116") || id.equals("5183") || id.equals("5177") || + id.equals("209289") || id.equals("198171") || id.equals("10419") || id.equals("470542") || id.equals("29992") || id.equals("666") || + id.equals("2026") || id.equals("45395") || id.equals("442021") || id.equals("423758") || id.equals("426930") || id.equals("998") || + id.equals("446163") || id.equals("378411") || id.equals("376457") || id.equals("470749") || id.equals("450641") || id.equals("470623") || + id.equals("470620") || id.equals("470754") || id.equals("470750") || id.equals("470739") || id.equals("470708") || id.equals("470581") || + id.equals("470578") || id.equals("470571") || id.equals("470552")) return false; return true; } @@ -643,7 +644,7 @@ public class ImgDownloader { throw new Exception(); } - public static String DownloadCardImages(String set, String[] availableSets, String targetres, String basePath, String destinationPath, ProgressDialog progressBarDialog) throws IOException { + public static String DownloadCardImages(String set, String[] availableSets, String targetres, String basePath, String destinationPath, ProgressDialog progressBarDialog, SDLActivity parent) throws IOException { String res = ""; String baseurl = "https://gatherer.wizards.com/Pages/Card/Details.aspx?multiverseid="; @@ -837,20 +838,20 @@ public class ImgDownloader { else if (scryset.equalsIgnoreCase("ZVE")) scryset = "DDP"; - for (int y = 0; y < mappa.size(); y++) { + for (int y = 0; y < mappa.size() && parent.downloadInProgress; y++) { String id = mappa.keySet().toArray()[y].toString(); progressBarDialog.incrementProgressBy((int) (1)); String specialcardurl = getSpecialCardUrl(id); if (!specialcardurl.isEmpty()) { URL url = new URL(specialcardurl); HttpURLConnection httpcon = (HttpURLConnection) url.openConnection(); - if(httpcon == null) { + if (httpcon == null) { System.err.println("Error: Problem fetching card: " + mappa.get(id) + "-" + id + ", i will not download it..."); break; } httpcon.addRequestProperty("User-Agent", "Mozilla/4.76"); InputStream in = null; - try{ + try { in = new BufferedInputStream(httpcon.getInputStream()); } catch (Exception ex) { System.out.println("Warning: Problem downloading card: " + mappa.get(id) + "-" + id + " from " + scryset + " on ScryFall, i will retry 2 times more..."); @@ -940,25 +941,32 @@ public class ImgDownloader { } String cardname = divs.get(k + 1).childNode(0).attributes().get("#text").replace("\r\n", "").trim(); - if(scryset.equals("S00") || scryset.equals("UST")){ + if (scryset.equals("UST") || scryset.equals("S00")) { + cardname = cardname.replace(" (a)", ""); + cardname = cardname.replace(" (b)", ""); + cardname = cardname.replace(" (c)", ""); + cardname = cardname.replace(" (d)", ""); + cardname = cardname.replace(" (e)", ""); + cardname = cardname.replace(" (f)", ""); + cardname = cardname.replace("...", ""); String deckutrl = "https://deckmaster.info/card.php?multiverseid="; - try{ + try { doc = Jsoup.connect(deckutrl + id).get(); - } catch(Exception e) { - System.out.println("Warning: Problem reading card (" + mappa.get(id) + ") infos from: " + deckutrl + id + ", i will retry 2 times more..."); - try{ + } catch (Exception e) { + System.out.println("Warning: Problem reading card (" + mappa.get(id) + ") infos from: " + deckutrl + id + ", i will retry 2 times more..."); + try { doc = Jsoup.connect(deckutrl + id).get(); - } catch(Exception e2) { - System.out.println("Warning: Problem reading card (" + mappa.get(id) + ") infos from: " + deckutrl + id + ", i will retry 1 time more..."); - try{ + } catch (Exception e2) { + System.out.println("Warning: Problem reading card (" + mappa.get(id) + ") infos from: " + deckutrl + id + ", i will retry 1 time more..."); + try { doc = Jsoup.connect(deckutrl + id).get(); - } catch(Exception e3) { - System.err.println("Error: Problem reading card (" + mappa.get(id) + ") infos from: " + deckutrl + id + ", i will not retry anymore..."); + } catch (Exception e3) { + System.err.println("Error: Problem reading card (" + mappa.get(id) + ") infos from: " + deckutrl + id + ", i will not retry anymore..."); continue; } } } - } else if(targetres.equals("High")) { + } else if (targetres.equals("High")) { try { doc = Jsoup.connect(imageurl + scryset.toLowerCase()).get(); Elements outlinks = doc.select("body a"); @@ -1064,7 +1072,7 @@ public class ImgDownloader { } } - if(doc == null){ + if (doc == null) { System.err.println("Error: Problem fetching card: " + mappa.get(id) + "-" + id + " from " + scryset + " on ScryFall, i will not download it..."); continue; } @@ -1077,7 +1085,7 @@ public class ImgDownloader { for (int i = 0; i < imgs.size(); i++) { String title = imgs.get(i).attributes().get("alt"); - if(title.isEmpty()) + if (title.isEmpty()) title = imgs.get(i).attributes().get("title"); if (title.toLowerCase().contains(cardname.toLowerCase())) { String CardImage = imgs.get(i).attributes().get("src"); @@ -1085,7 +1093,7 @@ public class ImgDownloader { CardImage = imgs.get(i).attributes().get("data-src"); URL url = new URL(CardImage); HttpURLConnection httpcon = (HttpURLConnection) url.openConnection(); - if(httpcon == null) { + if (httpcon == null) { System.err.println("Error: Problem fetching card: " + mappa.get(id) + "-" + id + ", i will not download it..."); break; } diff --git a/projects/mtg/Android/src/org/libsdl/app/SDLActivity.java b/projects/mtg/Android/src/org/libsdl/app/SDLActivity.java index ff11898c6..3b7afda07 100644 --- a/projects/mtg/Android/src/org/libsdl/app/SDLActivity.java +++ b/projects/mtg/Android/src/org/libsdl/app/SDLActivity.java @@ -476,7 +476,7 @@ public class SDLActivity extends Activity implements OnKeyListener { cardDownloader.create().show(); } - String targetRes = ""; + String targetRes = "High"; private void chooseResolution() { AlertDialog.Builder resChooser = new AlertDialog.Builder(this); @@ -492,10 +492,7 @@ public class SDLActivity extends Activity implements OnKeyListener { resChooser.setPositiveButton("Download Selected", new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int which) { - if (!targetRes.isEmpty()) - downloadCardImagesStart(); - else - chooseResolution(); + downloadCardImagesStart(); } }); @@ -504,10 +501,11 @@ public class SDLActivity extends Activity implements OnKeyListener { boolean error = false; String res = ""; - boolean dowloadInProgress = false; + public volatile boolean downloadInProgress = false; ProgressDialog cardDownloader; private void downloadCardImagesStart() { + final SDLActivity parent = this; final Handler mHandler = new Handler(); cardDownloader = new ProgressDialog(this); cardDownloader.setTitle("Downloading now set: " + set); @@ -520,7 +518,7 @@ public class SDLActivity extends Activity implements OnKeyListener { new Thread(new Runnable() { public void run() { - dowloadInProgress = true; + downloadInProgress = true; if (selectedSets != null) { for (int i = 0; i < selectedSets.size(); i++) { try { @@ -530,7 +528,7 @@ public class SDLActivity extends Activity implements OnKeyListener { cardDownloader.setTitle("Downloading set: " + set); } }); - String details = ImgDownloader.DownloadCardImages(set, availableSets, targetRes, getSystemStorageLocation(), getUserStorageLocation() + "sets/", cardDownloader); + String details = ImgDownloader.DownloadCardImages(set, availableSets, targetRes, getSystemStorageLocation(), getUserStorageLocation() + "sets/", cardDownloader, parent); if (!details.isEmpty()) { if (!res.isEmpty()) res = res + "\nSET " + set + ":\n" + details; @@ -544,8 +542,10 @@ public class SDLActivity extends Activity implements OnKeyListener { } mHandler.post(new Runnable() { public void run() { - downloadSelectedSetsCompleted(error, res); - dowloadInProgress = false; + if (downloadInProgress) { + downloadSelectedSetsCompleted(error, res); + downloadInProgress = false; + } cardDownloader.dismiss(); } }); @@ -564,7 +564,7 @@ public class SDLActivity extends Activity implements OnKeyListener { mHandler.post(new Runnable() { public void run() { downloadCardInterruped(set, cardDownloader.getProgress(), cardDownloader.getMax()); - dowloadInProgress = false; + downloadInProgress = false; cardDownloader.dismiss(); } }); @@ -585,6 +585,15 @@ public class SDLActivity extends Activity implements OnKeyListener { } }); + res = ""; + set = ""; + targetRes = "High"; + selectedSets = new ArrayList(); + for (int i = 0; i < checkedSet.length; i++) { + checkedSet[i] = false; + } + error = false; + infoDialog.create().show(); } @@ -598,12 +607,17 @@ public class SDLActivity extends Activity implements OnKeyListener { infoDialog.setTitle("Some errors occurred during the process!"); infoDialog.setMessage(res); } - infoDialog.create().show(); + res = ""; set = ""; - targetRes = ""; + targetRes = "High"; selectedSets = new ArrayList(); + for (int i = 0; i < checkedSet.length; i++) { + checkedSet[i] = false; + } error = false; + + infoDialog.create().show(); } @Override @@ -632,7 +646,7 @@ public class SDLActivity extends Activity implements OnKeyListener { if (loadResInProgress) { progressBarDialogRes.show(); progressBarDialogRes.show(); - } else if (dowloadInProgress) { + } else if (downloadInProgress) { cardDownloader.show(); cardDownloader.show(); } else