Use correct URL for TWIC import

Author: gkalab

scidOnTheGo/src/main/java/org/scid/android/twic/ImportTwicActivity.java

@@ -1,14 +1,9 @@
 package org.scid.android.twic;
 
-import java.io.File;
-
-import org.scid.android.IDownloadCallback;
-import org.scid.android.R;
-import org.scid.android.Tools;
-
 import android.app.ListActivity;
 import android.app.ProgressDialog;
 import android.content.Intent;
+import android.os.AsyncTask;
 import android.os.Bundle;
 import android.view.View;
 import android.widget.AdapterView;
@@ -17,6 +12,12 @@
 import android.widget.ListView;
 import android.widget.Toast;
 
+import org.scid.android.IDownloadCallback;
+import org.scid.android.R;
+import org.scid.android.Tools;
+
+import java.io.File;
+
 public class ImportTwicActivity extends ListActivity implements
 		IDownloadCallback {
 	private ProgressDialog progressDlg;
@@ -62,8 +63,8 @@ protected void showList() {
 		if (progressDlg != null && progressDlg.isShowing()) {
 			progressDlg.dismiss();
 		}
-		final ArrayAdapter<TwicItem> aa = new ArrayAdapter<TwicItem>(this,
-				android.R.layout.simple_list_item_1, downloader.getLinkList());
+		final ArrayAdapter<TwicItem> aa = new ArrayAdapter<>(this,
+                android.R.layout.simple_list_item_1, downloader.getLinkList());
 		setListAdapter(aa);
 		ListView lv = getListView();
 		lv.setOnItemClickListener(new OnItemClickListener() {
@@ -74,7 +75,7 @@ public void onItemClick(AdapterView<?> parent, View view, int pos,
 				progressDlg = ProgressDialog.show(ImportTwicActivity.this,
 						getString(R.string.twic_downloading),
 						getString(R.string.downloading), true, false);
-				new ImportZipTask().execute(ImportTwicActivity.this,
+				new ImportZipTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, ImportTwicActivity.this,
 						progressDlg, item.getLink());
 			}
 		});
@@ -103,16 +104,13 @@ public void downloadFailure(String message) {
 
 	@Override
 	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		switch (requestCode) {
-		case RESULT_PGN_IMPORT:
-			// the result after importing the pgn file - delete pgn file
+		if (requestCode == RESULT_PGN_IMPORT) {// the result after importing the pgn file - delete pgn file
 			if (resultCode == RESULT_OK && data != null) {
 				String pgnFileName = data.getAction();
 				if (pgnFileName != null) {
 					new File(pgnFileName).delete();
 				}
 			}
-			break;
 		}
 	}
 }

scidOnTheGo/src/main/java/org/scid/android/twic/TwicDownloader.java

@@ -17,18 +17,13 @@
 import java.util.List;
 import java.util.Set;
 
-public class TwicDownloader {
+class TwicDownloader {
+	private final static String OLD_TWIC_SITE = "https://www.theweekinchess.com";
+	private final static String NEW_TWIC_SITE = "https://theweekinchess.com";
+	private final static String TWIC_SITE = NEW_TWIC_SITE + "/twic/";
+	private Set<String> linkList = new HashSet<>();
 
-	private static String TWIC_SITE = "http://www.theweekinchess.com/twic/";
-	private Set<String> linkList = new HashSet<String>();
-
-	public File getCurrentTwic(String directory) throws IOException {
-		parseTwicSite();
-		String currentZip = getCurrentTwicZipName();
-		return getPgnFromZipUrl(directory, currentZip);
-	}
-
-	public File getPgnFromZipUrl(String directory, String zipUrl) throws IOException {
+	File getPgnFromZipUrl(String directory, String zipUrl) throws IOException {
 		File f = Tools.downloadFile(zipUrl);
 		if (f != null) {
 			return Tools.unzip(directory, f, true);
@@ -37,38 +32,29 @@ public File getPgnFromZipUrl(String directory, String zipUrl) throws IOException
 		}
 	}
 
-	public List<TwicItem> getLinkList() {
-		List<String> llist = new ArrayList<String>(linkList);
+	List<TwicItem> getLinkList() {
+		List<String> llist = new ArrayList<>(linkList);
 		Collections.sort(llist, Collections.reverseOrder());
-		List<TwicItem> result = new ArrayList<TwicItem>();
+		List<TwicItem> result = new ArrayList<>();
 		for (String link : llist) {
 			result.add(new TwicItem(link));
 		}
 		return result;
 	}
 
-	private String getCurrentTwicZipName() {
-		String result = null;
-		if (this.linkList.size() > 0) {
-			result = this.getLinkList().get(0).getLink();
-		}
-		return result;
-	}
-
-	public void parseTwicSite() {
-		String data = "";
+	void parseTwicSite() {
+		String data;
 		try {
 			URL obj = new URL(TWIC_SITE);
 			HttpURLConnection con = (HttpURLConnection) obj.openConnection();
 			con.setRequestMethod("GET");
-			con.setRequestProperty("User-Agent", "Mozilla/5.0");
 
 			int status = con.getResponseCode();
 			if (status != HttpURLConnection.HTTP_OK) {
 				BufferedReader in = new BufferedReader(new InputStreamReader(
 						con.getInputStream()));
 				String inputLine;
-				StringBuffer response = new StringBuffer();
+				StringBuilder response = new StringBuilder();
 				while ((inputLine = in.readLine()) != null) {
 					response.append(inputLine);
 				}
@@ -77,11 +63,11 @@ public void parseTwicSite() {
 			} else {
 				BufferedReader reader = new BufferedReader(new InputStreamReader(
 						con.getInputStream()));
-				StringBuffer stringBuffer = new StringBuffer();
-				String line = null;
+				StringBuilder stringBuffer = new StringBuilder();
+				String line;
 				int noLinks = 0;
 				while (noLinks < 20 && (line = reader.readLine()) != null) {
-					stringBuffer.append(line + "\n");
+					stringBuffer.append(line).append("\n");
 					if (line.contains("g.zip")) {
 						noLinks++;
 					}
@@ -92,13 +78,11 @@ public void parseTwicSite() {
 			List<Link> links = Tools.getLinks(data);
 			for (Link link : links) {
 				if (link.getLink().endsWith("g.zip")) {
-					linkList.add(link.getLink());
+					linkList.add(link.getLink().replace(OLD_TWIC_SITE, NEW_TWIC_SITE));
 				}
 			}
 		} catch (IOException e1) {
 			Log.e("SCID", e1.getMessage(), e1);
-			data = e1.getMessage();
 		}
 	}
-
 }