Merge pull request #9 from premkamal13/fix_data_fetch_from_spoj

Change protocol to https to fix SPOJ solutions' fetch failure

Author: koldbyte

src/com/koldbyte/codebackup/core/TestApp.java

@@ -114,12 +114,12 @@ public static void test7() {
 	}
 
 	public static void test8() {
-		Problem problem = new SpojProblem("http://www.spoj.com/problems/FCTRL/");
+		Problem problem = new SpojProblem("https://www.spoj.com/problems/FCTRL/");
 		System.out.println(problem.getProblemStatement());
 	}
 
 	public static void test9() {
-		User u = new SpojUser("koldbyte", "http://www.spoj.com/users/koldbyte/");
+		User u = new SpojUser("koldbyte", "https://www.spoj.com/users/koldbyte/");
 		PluginInterface plugin = new SpojPluginImpl();
 		List<Submission> list = plugin.getSolvedList(u);
 		for (Submission s : list) {
@@ -131,8 +131,8 @@ public static void test9() {
 	}
 
 	public static void test10() {
-		User u = new SpojUser("koldbyte", "http://www.spoj.com/users/koldbyte/");
-		Problem p = new SpojProblem("http://www.spoj.com/problems/BITMAP/");
+		User u = new SpojUser("koldbyte", "https://www.spoj.com/users/koldbyte/");
+		Problem p = new SpojProblem("https://www.spoj.com/problems/BITMAP/");
 		((SpojUser) u).setUsername("koldbyte");
 		((SpojUser) u).setPass("thisisrandompass");
 		Submission s = new SpojSubmission("11808446",

src/com/koldbyte/codebackup/plugins/spoj/SpojPluginImpl.java

@@ -19,15 +19,15 @@
 
 public class SpojPluginImpl implements PluginInterface {
 
-	private final String HTTP = "http://";
+	private final String HTTPS = "https://";
 	private final String SUBMISSIONLIST = "www.spoj.com/status/:u/signedlist/";
 
-	private final String LOGINURL = "http://www.spoj.com/login";
+	private final String LOGINURL = HTTPS + "www.spoj.com/login";
 
 	@Override
 	public List<Submission> getSolvedList(User user) {
 		List<Submission> subs = new ArrayList<Submission>();
-		String url = HTTP + SUBMISSIONLIST.replace(":u", user.getHandle());
+		String url = HTTPS + SUBMISSIONLIST.replace(":u", user.getHandle());
 
 		try {
 			//TODO: Add login to fetch the spoj signedlist
@@ -100,7 +100,7 @@ public List<Submission> getSolvedList(User user) {
 	@Override
 	public List<Submission> getAllSolvedList(User user) {
 		List<Submission> subs = new ArrayList<Submission>();
-		String url = HTTP + SUBMISSIONLIST.replace(":u", user.getHandle());
+		String url = HTTPS + SUBMISSIONLIST.replace(":u", user.getHandle());
 
 		try {
 			//TODO: Add login to fetch the spoj signedlist

src/com/koldbyte/codebackup/plugins/spoj/core/entities/SpojProblem.java

@@ -10,13 +10,13 @@
 import com.koldbyte.codebackup.core.entities.Problem;
 
 public class SpojProblem extends Problem {
-	private final String HTTP = "http://";
+	private final String HTTPS = "https://";
 	private final String PROBLEMURL = "www.spoj.com/problems/:p/";
 
 	@Override
 	public String fetchProblemStatement() {
 		String problem = getProblemId();
-		String url = HTTP + PROBLEMURL.replace(":p", problem);
+		String url = HTTPS + PROBLEMURL.replace(":p", problem);
 		/*-
 		 * Spoj Problem Page looks like this 
 		 * 
@@ -56,7 +56,7 @@ public String getUrl() {
 			// replace ":p" with the problem id
 			problemUrl.replace(":p", problemId);
 
-			url = HTTP + PROBLEMURL;
+			url = HTTPS + PROBLEMURL;
 			this.setUrl(url);
 		}
 		return url;
@@ -66,7 +66,7 @@ public String getUrl() {
 	public String getProblemId() {
 		if (problemId == null || problemId.isEmpty()) {
 			String u = getUrl();
-			u = u.replace(HTTP, "");
+			u = u.replace(HTTPS, "");
 			u = u.replace("www.spoj.com/problems/", "");
 			u = u.replace("/", "");
 			this.setProblemId(u);

src/com/koldbyte/codebackup/plugins/spoj/core/entities/SpojSubmission.java

@@ -10,9 +10,9 @@
 import com.koldbyte.codebackup.core.entities.User;
 
 public class SpojSubmission extends Submission {
-	private final String HTTP = "http://";
+	private final String HTTPS = "https://";
 	private final String SUBMITTEDURL = "www.spoj.com/files/src/save/:s/";
-	private final String LOGINURL = "http://www.spoj.com/login";
+	private final String LOGINURL = HTTPS + "www.spoj.com/login";
 
 	@Override
 	public String fetchSubmittedCode() {
@@ -34,7 +34,7 @@ public String fetchSubmittedCode() {
 					.method(Connection.Method.POST).execute();
 
 			// login done...now use the cookies to whenever u are fetching code
-			String url = HTTP + SUBMITTEDURL.replace(":s", submissionId);
+			String url = HTTPS + SUBMITTEDURL.replace(":s", submissionId);
 			String code = Jsoup.connect(url).ignoreContentType(true)
 					.cookies(loginForm.cookies()).method(Connection.Method.GET)
 					.execute().body();
@@ -57,15 +57,15 @@ public String fetchSubmittedCode() {
 	@Override
 	public String getSubmissionIdFromUrl() {
 		String url = getSubmissionUrl();
-		url = url.replace(HTTP, "");
+		url = url.replace(HTTPS, "");
 		url = url.replace("www.spoj.com/files/src/save/", "");
 		url = url.replace("/", "");
 		return url;
 	}
 
 	@Override
 	public String getSubmissionUrlFromId() {
-		String subId = HTTP + SUBMITTEDURL.replace(":s", getSubmissionId());
+		String subId = HTTPS + SUBMITTEDURL.replace(":s", getSubmissionId());
 		return subId;
 	}
 

src/com/koldbyte/codebackup/plugins/spoj/core/entities/SpojUser.java

@@ -3,7 +3,7 @@
 import com.koldbyte.codebackup.core.entities.User;
 
 public class SpojUser extends User {
-	private final String HTTP = "http://";
+	private final String HTTPS = "https://";
 	private final String PROFILEURL = "www.spoj.com/users/:u/";
 
 	private String username;
@@ -36,15 +36,15 @@ public SpojUser(String handle, String profileUrl) {
 	@Override
 	public String getHandleFromProfileUrl() {
 		String handle = profileUrl;
-		handle = handle.replace(HTTP, "");
+		handle = handle.replace(HTTPS, "");
 		handle = handle.replace("www.spoj.com/users/", "");
 		handle = handle.replace("/", "");
 		return handle;
 	}
 
 	@Override
 	public String getProfileUrlFromHandle() {
-		return HTTP + PROFILEURL.replace(":u", this.handle);
+		return HTTPS + PROFILEURL.replace(":u", this.handle);
 	}
 
 	@Override