Improved Android Downloader: Bug Fixing and boosted token searching algorithm.
This commit is contained in:
valfieri
@@ -363,6 +363,8 @@ public class ImgDownloader {
|
||||
|
||||
if(id.equals("380486t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/BNG/-5-hr.jpg";
|
||||
else if(id.equals("380482t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/THS/-21-hr.jpg";
|
||||
else if(id.equals("184589t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/M14/-28-hr.jpg";
|
||||
else if(id.equals("368951t") || id.equals("426025t"))
|
||||
@@ -371,19 +373,37 @@ public class ImgDownloader {
|
||||
tokenurl = "https://deckmaster.info/images/cards/JOU/-41-hr.jpg";
|
||||
else if(id.equals("114917t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/JOU/-43-hr.jpg";
|
||||
else if(id.equals("234849t"))
|
||||
else if(id.equals("234849t") || id.equals("366401t") || id.equals("366340t") || id.equals("366375t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/RTR/-61-hr.jpg";
|
||||
else if(id.equals("423817t") || id.equals("423700t") || id.equals("183017t"))
|
||||
else if(id.equals("48096t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/CNS/-89-hr.jpg";
|
||||
else if(id.equals("47450t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/NPH/-205-hr.jpg";
|
||||
else if(id.equals("423817t") || id.equals("423700t") || id.equals("183017t") || id.equals("6164t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/MBS/-216-hr.jpg";
|
||||
else if(id.equals("140233t") || id.equals("191239t") || id.equals("205957t") || id.equals("423797t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/M11/-234-hr.jpg";
|
||||
else if (id.equals("271227t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/WWK/-265-hr.jpg";
|
||||
else if(id.equals("185704t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/ZEN/-277-hr.jpg";
|
||||
else if(id.equals("175105t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/ALA/-325-hr.jpg";
|
||||
else if(id.equals("376496t") || id.equals("376549t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/ALA/-327-hr.jpg";
|
||||
else if(id.equals("247202t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/EVE/-338-hr.jpg";
|
||||
else if(id.equals("376546t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/SHM/-352-hr.jpg";
|
||||
else if(id.equals("244668t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/SHM/-356-hr.jpg";
|
||||
else if(id.equals("457111t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/MOR/-362-hr.jpg";
|
||||
else if(id.equals("83236t") || id.equals("45390t") || id.equals("965t") || id.equals("9656"))
|
||||
else if(id.equals("376578t") || id.equals("152553t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/LRW/-365-hr.jpg";
|
||||
else if(id.equals("153166t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/LRW/-367-hr.jpg";
|
||||
else if(id.equals("83236t") || id.equals("45390t") || id.equals("965t") || id.equals("966t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/8ED/-391-hr.jpg";
|
||||
else if(id.equals("19878t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/C14/-482-hr.jpg";
|
||||
@@ -393,15 +413,21 @@ public class ImgDownloader {
|
||||
tokenurl = "https://deckmaster.info/images/cards/AST/-884-hr.jpg";
|
||||
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("407540t") || id.equals("407672t") || id.equals("407525t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/BFZ/-944-hr.jpg";
|
||||
else if(id.equals("460768t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/C15/-2009-hr.jpg";
|
||||
else if(id.equals("201124t") || id.equals("3118t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/AL/-2029-hr.jpg";
|
||||
else if(id.equals("184730t") || id.equals("3192t") || id.equals("3193t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/AL/-2028-hr.jpg";
|
||||
else if(id.equals("6142t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/EX/-2035-hr.jpg";
|
||||
else if(id.equals("34929t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/JUD/-2043-hr.jpg";
|
||||
else if(id.equals("1649t") || id.equals("201182t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/LE/-2046-hr.jpg";
|
||||
else if(id.equals("4854t"))
|
||||
else if(id.equals("4854t") || id.equals("376556t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/TE/-2059-hr.jpg";
|
||||
else if(id.equals("4771t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/TE/-2060-hr.jpg";
|
||||
@@ -423,8 +449,14 @@ public class ImgDownloader {
|
||||
tokenurl = "https://deckmaster.info/images/cards/AL/-2156-hr.jpg";
|
||||
else if(id.equals("26815t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/AP/-2163-hr.jpg";
|
||||
else if(id.equals("130314t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/FUT/-2168-hr.jpg";
|
||||
else if(id.equals("116383t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/TSP/-2170-hr.jpg";
|
||||
else if(id.equals("124344t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/PLC/-2172-hr.jpg";
|
||||
else if(id.equals("376404t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/OGW/-2189-hr.jpg";
|
||||
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("3242t"))
|
||||
@@ -445,12 +477,18 @@ public class ImgDownloader {
|
||||
tokenurl = "https://deckmaster.info/images/cards/A25/-5648-hr.jpg";
|
||||
else if(id.equals("452760t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/M19/-6036.jpg";
|
||||
else if(id.equals("89110t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/GK1_SELESN/-6550-hr.jpg";
|
||||
else if(id.equals("3832t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/GK1_DIMIR/-6541-hr.jpg";
|
||||
else if(id.equals("116384t") || id.equals("376564t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/TSP/-114916-hr.jpg";
|
||||
else if(id.equals("5610t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/DDE/207998-hr.jpg";
|
||||
else if(id.equals("5173t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/DDE/209163-hr.jpg";
|
||||
else if(id.equals("271158t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/DDP/401721-hr.jpg";
|
||||
else if (id.equals("88973t") || id.equals("368549t"))
|
||||
tokenurl = "https://deckmaster.info/images/cards/DDQ/409655-hr.jpg";
|
||||
else if(id.equals("3392t"))
|
||||
@@ -467,12 +505,26 @@ public class ImgDownloader {
|
||||
tokenurl = "https://img.scryfall.com/cards/normal/front/1/0/105e687e-7196-4010-a6b7-cfa42d998fa4.jpg?1560096976";
|
||||
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("113527t"))
|
||||
else if(id.equals("113527t") || id.equals("376321t"))
|
||||
tokenurl = "https://img.scryfall.com/cards/large/front/5/b/5b9f471a-1822-4981-95a9-8923d83ddcbf.jpg?1562702075";
|
||||
else if(id.equals("114919t"))
|
||||
else if(id.equals("114919t") || id.equals("247519t"))
|
||||
tokenurl = "https://img.scryfall.com/cards/large/front/b/5/b5ddb67c-82fb-42d6-a4c2-11cd38eb128d.jpg?1562702281";
|
||||
else if(id.equals("8862t"))
|
||||
tokenurl = "https://img.scryfall.com/cards/large/front/d/b/dbf33cc3-254f-4c5c-be22-3a2d96f29b80.jpg?1562936030";
|
||||
else if(id.equals("376421t") && id.equals("213757t") && id.equals("213734t") && id.equals("221554t") || id.equals("48049t") || id.equals("46160t"))
|
||||
tokenurl = "https://img.scryfall.com/cards/large/front/f/3/f32ad93f-3fd5-465c-ac6a-6f8fb57c19bd.jpg?1561758422";
|
||||
else if(id.equals("247393t") || id.equals("247399t"))
|
||||
tokenurl = "https://img.scryfall.com/cards/large/front/1/f/1feaa879-ceb3-4b20-8021-ae41d8be9005.jpg?1562636755";
|
||||
else if(id.equals("152998t") || id.equals("152963t"))
|
||||
tokenurl = "https://img.scryfall.com/cards/large/front/9/5/959ed4bf-b276-45ed-b44d-c757e9c25846.jpg?1562702204";
|
||||
else if(id.equals("46703t") || id.equals("227151t") || id.equals("205298t"))
|
||||
tokenurl = "https://img.scryfall.com/cards/large/front/0/a/0a9a25fd-1a4c-4d63-bbfa-296ef53feb8b.jpg?1562541933";
|
||||
else if(id.equals("394380t"))
|
||||
tokenurl = "https://img.scryfall.com/cards/large/front/6/2/622397a1-6513-44b9-928a-388be06d4022.jpg?1562702085";
|
||||
else if(id.equals("1138t"))
|
||||
tokenurl = "https://img.scryfall.com/cards/large/front/c/7/c75b81b5-5c84-45d4-832a-20c038372bc6.jpg?1561758040";
|
||||
else if(id.equals("275261t") || id.equals("271156t"))
|
||||
tokenurl = "https://img.scryfall.com/cards/large/front/1/f/1feaa879-ceb3-4b20-8021-ae41d8be9005.jpg?1562636755";
|
||||
else if(id.equals("74492t"))
|
||||
tokenurl = "https://media.mtgsalvation.com/attachments/94/295/635032496473215708.jpg";
|
||||
else if(id.equals("3280t"))
|
||||
@@ -487,6 +539,8 @@ public class ImgDownloader {
|
||||
tokenurl = "https://i.pinimg.com/564x/6e/8d/fe/6e8dfeee2919a3efff210df56ab7b85d.jpg";
|
||||
else if(id.equals("136155t"))
|
||||
tokenurl = "https://i.pinimg.com/564x/5d/68/d6/5d68d67bef76bf90588a4afdc39dc60e.jpg";
|
||||
else if(id.equals("3421t"))
|
||||
tokenurl = "https://www.mtg.onl/static/3c152b4fc1c64e3ce21022f53ec16559/4d406/PROXY_Cat_G_1_1.jpg";
|
||||
else if(id.equals("73976t"))
|
||||
tokenurl = "https://www.mtg.onl/static/8bbca3c195e798ca92b4a112275072e2/4d406/PROXY_Ape_G_1_1.jpg";
|
||||
else if(id.equals("49026t"))
|
||||
@@ -505,10 +559,20 @@ public class ImgDownloader {
|
||||
tokenurl = "https://www.mtg.onl/static/48515f01d0fda15dd9308d3a528dae7b/4d406/PROXY_Spirit_W_3_3.jpg";
|
||||
else if(id.equals("23319t"))
|
||||
tokenurl = "https://www.mtg.onl/static/0f8b0552293c03a3a29614cc83024337/4d406/PROXY_Reflection_W_X_X.jpg";
|
||||
else if(id.equals("130638t"))
|
||||
tokenurl = "https://www.mtg.onl/static/20b01e1378e7b8e8b47066c52761fde2/4d406/PROXY_Giant_R_4_4.jpg";
|
||||
else if(id.equals("74411t"))
|
||||
tokenurl = "https://www.mtg.onl/static/5f65ea90850736160a28f3a5bd56744a/4d406/PROXY_Warrior_R_1_1.jpg";
|
||||
else if(id.equals("126816t"))
|
||||
tokenurl = "https://www.mtg.onl/static/e25f8b900e6238d0047039da4690f1c4/4d406/PROXY_Knight_B_2_2.jpg";
|
||||
else if(id.equals("75291t"))
|
||||
tokenurl = "http://4.bp.blogspot.com/-y5Fanm3qvrU/Vmd4gGnl2DI/AAAAAAAAAWY/FCrS9FTgOJk/s1600/Tatsumasa%2BToken.jpg";
|
||||
else if (id.equals("26732t"))
|
||||
tokenurl = "http://1.bp.blogspot.com/-0-mLvfUVgNk/VmdZWXWxikI/AAAAAAAAAUM/TVCIiZ_c67g/s1600/Spawn%2BToken.jpg";
|
||||
else if(id.equals("5261t"))
|
||||
tokenurl = "https://static.cardmarket.com/img/5a0199344cad68eebeefca6fa24e52c3/items/1/MH1/376905.jpg";
|
||||
else if(id.equals("430686t"))
|
||||
tokenurl = "https://cdn.shopify.com/s/files/1/1601/3103/products/Token_45_2000x.jpg?v=1528922847";
|
||||
|
||||
return tokenurl;
|
||||
}
|
||||
@@ -530,7 +594,7 @@ public class ImgDownloader {
|
||||
return true;
|
||||
}
|
||||
|
||||
public static Document findTokenPage(String imageurl, String name, String set, String[] availableSets, String tokenstats, SDLActivity parent) throws Exception {
|
||||
public static Document findTokenPage(String imageurl, String name, String set, String[] availableSets, String tokenstats, String color, SDLActivity parent) throws Exception {
|
||||
Document doc = null;
|
||||
Elements outlinks = null;
|
||||
try {
|
||||
@@ -653,8 +717,19 @@ public class ImgDownloader {
|
||||
}
|
||||
if (!parent.downloadInProgress)
|
||||
break;
|
||||
if (stats.get(y).childNode(p).attributes().get("#text").contains(tokenstats))
|
||||
return tokendoc;
|
||||
if(stats.get(y).childNode(p).attributes().get("#text").contains(tokenstats)){
|
||||
if(!color.equals("(C)")){
|
||||
if(stats.get(y).childNode(p).attributes().get("#text").contains(color))
|
||||
return tokendoc;
|
||||
} else {
|
||||
if(!stats.get(y).childNode(p).attributes().get("#text").contains("(U") &&
|
||||
!stats.get(y).childNode(p).attributes().get("#text").contains("(G") &&
|
||||
!stats.get(y).childNode(p).attributes().get("#text").contains("(B") &&
|
||||
!stats.get(y).childNode(p).attributes().get("#text").contains("(R") &&
|
||||
!stats.get(y).childNode(p).attributes().get("#text").contains("(W"))
|
||||
return tokendoc;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1306,58 +1381,135 @@ public class ImgDownloader {
|
||||
String nametoken = "";
|
||||
String nametocheck = "";
|
||||
String tokenstats = "";
|
||||
String color = "";
|
||||
String color1 = "";
|
||||
String color2 = "";
|
||||
for (int l = 1; l < arrays.length - 1; l++) {
|
||||
if (arrays[l].equalsIgnoreCase("creature") && arrays[l + 1].toLowerCase().contains("token")) {
|
||||
nametoken = arrays[l - 1];
|
||||
if (l - 3 > 0)
|
||||
if(l - 3 > 0){
|
||||
tokenstats = arrays[l - 3];
|
||||
if (!tokenstats.contains("/")) {
|
||||
if (l - 4 > 0)
|
||||
tokenstats = arrays[l - 4];
|
||||
color1 = arrays[l - 2];
|
||||
}
|
||||
if (!tokenstats.contains("/")) {
|
||||
if (l - 5 > 0)
|
||||
if(!tokenstats.contains("/")){
|
||||
if(l - 4 > 0){
|
||||
tokenstats = arrays[l - 4];
|
||||
color1 = arrays[l - 3];
|
||||
}
|
||||
}
|
||||
if(!tokenstats.contains("/")){
|
||||
if(l - 5 > 0){
|
||||
tokenstats = arrays[l - 5];
|
||||
color1 = arrays[l - 4];
|
||||
color2 = arrays[l - 2];
|
||||
}
|
||||
}
|
||||
if (!tokenstats.contains("/")) {
|
||||
if (l - 6 > 0)
|
||||
if(!tokenstats.contains("/")){
|
||||
if(l - 6 > 0){
|
||||
tokenstats = arrays[l - 6];
|
||||
color1 = arrays[l - 5];
|
||||
color2 = arrays[l - 3];
|
||||
}
|
||||
}
|
||||
if (!tokenstats.contains("/")) {
|
||||
if (l - 7 > 0)
|
||||
if(!tokenstats.contains("/")){
|
||||
if(l - 7 > 0){
|
||||
tokenstats = arrays[l - 7];
|
||||
color1 = arrays[l - 6];
|
||||
color2 = arrays[l - 4];
|
||||
}
|
||||
}
|
||||
if (nametoken.equalsIgnoreCase("artifact")) {
|
||||
if (l - 2 > 0)
|
||||
if(nametoken.equalsIgnoreCase("artifact")){
|
||||
if(l - 2 > 0)
|
||||
nametoken = arrays[l - 2];
|
||||
if (l - 4 > 0)
|
||||
if(l - 4 > 0){
|
||||
tokenstats = arrays[l - 4];
|
||||
if (!tokenstats.contains("/")) {
|
||||
if (l - 5 > 0)
|
||||
color1 = arrays[l - 3];
|
||||
}
|
||||
if(!tokenstats.contains("/")){
|
||||
if(l - 5 > 0){
|
||||
tokenstats = arrays[l - 5];
|
||||
color1 = arrays[l - 4];
|
||||
}
|
||||
}
|
||||
if (!tokenstats.contains("/")) {
|
||||
if (l - 6 > 0)
|
||||
if(!tokenstats.contains("/")){
|
||||
if(l - 6 > 0){
|
||||
tokenstats = arrays[l - 6];
|
||||
color1 = arrays[l - 5];
|
||||
color2 = arrays[l - 3];
|
||||
}
|
||||
}
|
||||
if (!tokenstats.contains("/")) {
|
||||
if (l - 7 > 0)
|
||||
if(!tokenstats.contains("/")){
|
||||
if(l - 7 > 0){
|
||||
tokenstats = arrays[l - 7];
|
||||
color1 = arrays[l - 6];
|
||||
color2 = arrays[l - 4];
|
||||
}
|
||||
}
|
||||
if (!tokenstats.contains("/")) {
|
||||
if (l - 8 > 0)
|
||||
if(!tokenstats.contains("/")){
|
||||
if(l - 8 > 0) {
|
||||
tokenstats = arrays[l - 8];
|
||||
color1 = arrays[l - 7];
|
||||
color2 = arrays[l - 5];
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!tokenstats.contains("/"))
|
||||
if(!tokenstats.contains("/"))
|
||||
tokenstats = "";
|
||||
|
||||
if(color1.toLowerCase().contains("white"))
|
||||
color1 = "W";
|
||||
else if(color1.toLowerCase().contains("blue"))
|
||||
color1 = "U";
|
||||
else if(color1.toLowerCase().contains("black"))
|
||||
color1 = "B";
|
||||
else if(color1.toLowerCase().contains("red"))
|
||||
color1 = "R";
|
||||
else if(color1.toLowerCase().contains("green"))
|
||||
color1 = "G";
|
||||
else if (color1.toLowerCase().contains("colorless"))
|
||||
color1 = "C";
|
||||
else
|
||||
color1 = "";
|
||||
|
||||
if(color2.toLowerCase().contains("white"))
|
||||
color2 = "W";
|
||||
else if(color1.toLowerCase().contains("blue"))
|
||||
color2 = "U";
|
||||
else if(color1.toLowerCase().contains("black"))
|
||||
color2 = "B";
|
||||
else if(color1.toLowerCase().contains("red"))
|
||||
color2 = "R";
|
||||
else if(color1.toLowerCase().contains("green"))
|
||||
color2 = "G";
|
||||
else
|
||||
color2 = "";
|
||||
|
||||
if(!color1.isEmpty()){
|
||||
color = "(" + color1 + color2 + ")";
|
||||
}
|
||||
break;
|
||||
} else if (arrays[l].equalsIgnoreCase("put") && arrays[l + 3].toLowerCase().contains("token")) {
|
||||
nametoken = arrays[l + 2];
|
||||
for (int j = 1; j < arrays.length - 1; j++) {
|
||||
if (arrays[j].contains("/"))
|
||||
if (arrays[j].contains("/")){
|
||||
tokenstats = arrays[j];
|
||||
color = arrays[j+1];
|
||||
}
|
||||
}
|
||||
if(color.toLowerCase().contains("white"))
|
||||
color = "(W)";
|
||||
else if(color.toLowerCase().contains("blue"))
|
||||
color = "(U)";
|
||||
else if(color.toLowerCase().contains("black"))
|
||||
color = "(B)";
|
||||
else if(color.toLowerCase().contains("red"))
|
||||
color = "(R)";
|
||||
else if(color.toLowerCase().contains("green"))
|
||||
color = "(G)";
|
||||
else if (color.toLowerCase().contains("colorless"))
|
||||
color = "(C)";
|
||||
else
|
||||
color = "";
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -1385,7 +1537,7 @@ public class ImgDownloader {
|
||||
doc = Jsoup.connect(imageurl + scryset.toLowerCase()).get();
|
||||
} else {
|
||||
try {
|
||||
doc = findTokenPage(imageurl, nametoken, scryset, availableSets, tokenstats, parent);
|
||||
doc = findTokenPage(imageurl, nametoken, scryset, availableSets, tokenstats, color, parent);
|
||||
tokenfound = true;
|
||||
nametocheck = nametoken;
|
||||
} catch (Exception e) {
|
||||
|
||||
@@ -427,6 +427,7 @@ public class SDLActivity extends Activity implements OnKeyListener {
|
||||
} catch (Exception e) {
|
||||
}
|
||||
}
|
||||
selectedSets = new ArrayList<String>();
|
||||
downloadCardImages();
|
||||
}
|
||||
});
|
||||
@@ -440,9 +441,7 @@ public class SDLActivity extends Activity implements OnKeyListener {
|
||||
|
||||
private void downloadCardImages() {
|
||||
AlertDialog.Builder cardDownloader = new AlertDialog.Builder(this);
|
||||
|
||||
cardDownloader.setTitle("Which Sets would you like to download?");
|
||||
selectedSets = new ArrayList<String>();
|
||||
|
||||
cardDownloader.setMultiChoiceItems(availableSets, checkedSet, new DialogInterface.OnMultiChoiceClickListener() {
|
||||
public void onClick(DialogInterface dialog, int which, boolean isChecked) {
|
||||
@@ -466,7 +465,8 @@ public class SDLActivity extends Activity implements OnKeyListener {
|
||||
|
||||
cardDownloader.setPositiveButton("Download Selected", new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) { }
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
}
|
||||
});
|
||||
|
||||
final AlertDialog dialog = cardDownloader.create();
|
||||
@@ -475,10 +475,10 @@ public class SDLActivity extends Activity implements OnKeyListener {
|
||||
dialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
if (selectedSets.size() > 0){
|
||||
if (selectedSets.size() > 0) {
|
||||
chooseResolution();
|
||||
dialog.dismiss();
|
||||
}
|
||||
dialog.dismiss();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
@@ -503,6 +503,12 @@ public class SDLActivity extends Activity implements OnKeyListener {
|
||||
}
|
||||
});
|
||||
|
||||
resChooser.setNegativeButton("Change Selection", new DialogInterface.OnClickListener() {
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
downloadCardImages();
|
||||
}
|
||||
});
|
||||
|
||||
resChooser.create().show();
|
||||
}
|
||||
|
||||
@@ -530,11 +536,12 @@ public class SDLActivity extends Activity implements OnKeyListener {
|
||||
paused = false;
|
||||
if (selectedSets != null) {
|
||||
for (int i = 0; i < selectedSets.size() && downloadInProgress; i++) {
|
||||
while(paused){
|
||||
while (paused) {
|
||||
try {
|
||||
Thread.sleep(1000);
|
||||
} catch (InterruptedException e) {}
|
||||
if(!downloadInProgress)
|
||||
} catch (InterruptedException e) {
|
||||
}
|
||||
if (!downloadInProgress)
|
||||
break;
|
||||
}
|
||||
try {
|
||||
@@ -594,7 +601,8 @@ public class SDLActivity extends Activity implements OnKeyListener {
|
||||
|
||||
cardDownloader.setButton(DialogInterface.BUTTON_NEUTRAL, "Pause", new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialog, int which) { }
|
||||
public void onClick(DialogInterface dialog, int which) {
|
||||
}
|
||||
});
|
||||
|
||||
final AlertDialog dialog = (AlertDialog) cardDownloader;
|
||||
@@ -602,9 +610,8 @@ public class SDLActivity extends Activity implements OnKeyListener {
|
||||
|
||||
dialog.getButton(AlertDialog.BUTTON_NEUTRAL).setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v)
|
||||
{
|
||||
if(!paused) {
|
||||
public void onClick(View v) {
|
||||
if (!paused) {
|
||||
paused = true;
|
||||
AlertDialog d = (AlertDialog) dialog;
|
||||
d.getButton(AlertDialog.BUTTON_NEUTRAL).setText("Resume");
|
||||
|
||||
Reference in New Issue
Block a user