commit 36e2cbdd4753ad5ee1aede2de7df0c33da7f08b1
Author: Leszek Koltunski <leszek@koltunski.pl>
Date:   Tue Feb 11 00:49:24 2020 +0000

    Downloading High Scores: actually downloading scores!

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index cedda6db..2864769c 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -2,6 +2,7 @@
     package="org.distorted.magic">
 
     <uses-feature android:glEsVersion="0x00030001" android:required="true" />
+    <uses-permission android:name="android.permission.INTERNET" />
 
     <application
         android:allowBackup="true"
diff --git a/src/main/java/org/distorted/magic/RubikActivity.java b/src/main/java/org/distorted/magic/RubikActivity.java
index c6d38bc2..23fde701 100644
--- a/src/main/java/org/distorted/magic/RubikActivity.java
+++ b/src/main/java/org/distorted/magic/RubikActivity.java
@@ -43,7 +43,7 @@ public class RubikActivity extends AppCompatActivity implements View.OnClickList
 {
     public static final int MIN_SCRAMBLE =  1;
     public static final int DEF_SCRAMBLE =  1;
-    public static final int MAX_SCRAMBLE = 17;
+    public static final int MAX_SCRAMBLE = 18;
 
     private static int mSize = RubikSize.DEFAULT_SIZE;
     private HorizontalNumberPicker mPicker;
diff --git a/src/main/java/org/distorted/magic/RubikScoresDownloader.java b/src/main/java/org/distorted/magic/RubikScoresDownloader.java
index 46af703c..618e8cd6 100644
--- a/src/main/java/org/distorted/magic/RubikScoresDownloader.java
+++ b/src/main/java/org/distorted/magic/RubikScoresDownloader.java
@@ -19,6 +19,11 @@
 
 package org.distorted.magic;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 class RubikScoresDownloader implements Runnable
@@ -28,7 +33,7 @@ class RubikScoresDownloader implements Runnable
     void receive(String[][][][] scores);
     }
 
-  static final int MAX_PLACES = 10;
+  static final int MAX_PLACES = 12;
 
   private static final int DOWNLOAD   = 0;
   private static final int SUBMIT     = 1;
@@ -36,8 +41,42 @@ class RubikScoresDownloader implements Runnable
 
   private static final String URL  ="http://koltunski.pl/rubik/cgi-bin";
 
+  private final String[] hex = {
+    "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07",
+    "%08", "%09", "%0a", "%0b", "%0c", "%0d", "%0e", "%0f",
+    "%10", "%11", "%12", "%13", "%14", "%15", "%16", "%17",
+    "%18", "%19", "%1a", "%1b", "%1c", "%1d", "%1e", "%1f",
+    "%20", "%21", "%22", "%23", "%24", "%25", "%26", "%27",
+    "%28", "%29", "%2a", "%2b", "%2c", "%2d", "%2e", "%2f",
+    "%30", "%31", "%32", "%33", "%34", "%35", "%36", "%37",
+    "%38", "%39", "%3a", "%3b", "%3c", "%3d", "%3e", "%3f",
+    "%40", "%41", "%42", "%43", "%44", "%45", "%46", "%47",
+    "%48", "%49", "%4a", "%4b", "%4c", "%4d", "%4e", "%4f",
+    "%50", "%51", "%52", "%53", "%54", "%55", "%56", "%57",
+    "%58", "%59", "%5a", "%5b", "%5c", "%5d", "%5e", "%5f",
+    "%60", "%61", "%62", "%63", "%64", "%65", "%66", "%67",
+    "%68", "%69", "%6a", "%6b", "%6c", "%6d", "%6e", "%6f",
+    "%70", "%71", "%72", "%73", "%74", "%75", "%76", "%77",
+    "%78", "%79", "%7a", "%7b", "%7c", "%7d", "%7e", "%7f",
+    "%80", "%81", "%82", "%83", "%84", "%85", "%86", "%87",
+    "%88", "%89", "%8a", "%8b", "%8c", "%8d", "%8e", "%8f",
+    "%90", "%91", "%92", "%93", "%94", "%95", "%96", "%97",
+    "%98", "%99", "%9a", "%9b", "%9c", "%9d", "%9e", "%9f",
+    "%a0", "%a1", "%a2", "%a3", "%a4", "%a5", "%a6", "%a7",
+    "%a8", "%a9", "%aa", "%ab", "%ac", "%ad", "%ae", "%af",
+    "%b0", "%b1", "%b2", "%b3", "%b4", "%b5", "%b6", "%b7",
+    "%b8", "%b9", "%ba", "%bb", "%bc", "%bd", "%be", "%bf",
+    "%c0", "%c1", "%c2", "%c3", "%c4", "%c5", "%c6", "%c7",
+    "%c8", "%c9", "%ca", "%cb", "%cc", "%cd", "%ce", "%cf",
+    "%d0", "%d1", "%d2", "%d3", "%d4", "%d5", "%d6", "%d7",
+    "%d8", "%d9", "%da", "%db", "%dc", "%dd", "%de", "%df",
+    "%e0", "%e1", "%e2", "%e3", "%e4", "%e5", "%e6", "%e7",
+    "%e8", "%e9", "%ea", "%eb", "%ec", "%ed", "%ee", "%ef",
+    "%f0", "%f1", "%f2", "%f3", "%f4", "%f5", "%f6", "%f7",
+    "%f8", "%f9", "%fa", "%fb", "%fc", "%fd", "%fe", "%ff"
+    };
+
   private static boolean mRunning = false;
-  private static Thread mNetworkThrd = null;
   private static int mMode = IDLE;
   private static Receiver mReceiver;
 
@@ -105,10 +144,102 @@ class RubikScoresDownloader implements Runnable
       }
     }
 
+///////////////////////////////////////////////////////////////////////////////////////////////////
+
+  private String URLencode(String s)
+    {
+    StringBuilder sbuf = new StringBuilder();
+    int len = s.length();
+
+    for (int i = 0; i < len; i++)
+      {
+      int ch = s.charAt(i);
+
+           if ('A' <= ch && ch <= 'Z') sbuf.append((char)ch);
+      else if ('a' <= ch && ch <= 'z') sbuf.append((char)ch);
+      else if ('0' <= ch && ch <= '9') sbuf.append((char)ch);
+      else if (ch == ' '             ) sbuf.append('+');
+      else if (ch == '-' || ch == '_'
+            || ch == '.' || ch == '!'
+            || ch == '~' || ch == '*'
+            || ch == '\'' || ch == '('
+            || ch == ')'             ) sbuf.append((char)ch);
+      else if (ch <= 0x007f)           sbuf.append(hex[ch]);
+      else if (ch <= 0x07FF)
+        {
+        sbuf.append(hex[0xc0 | (ch >> 6)]);
+        sbuf.append(hex[0x80 | (ch & 0x3F)]);
+        }
+      else
+        {
+        sbuf.append(hex[0xe0 | (ch >> 12)]);
+        sbuf.append(hex[0x80 | ((ch >> 6) & 0x3F)]);
+        sbuf.append(hex[0x80 | (ch & 0x3F)]);
+        }
+      }
+
+    return sbuf.toString();
+    }
+
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   private void doDownload()
     {
+    String veri = "distored";
+    String name = URLencode(veri);
+    int numRuns = 1;
+    String version = R.string.app_version+"d";
+    String message=URL+"/download.cgi?n="+name+"&r="+numRuns+"&e="+version;
+
+    try
+      {
+      java.net.URL connectURL = new URL(message);
+      HttpURLConnection conn = (HttpURLConnection)connectURL.openConnection();
+
+      conn.setDoInput(true);
+      conn.setDoOutput(true);
+      conn.setUseCaches(false);
+      conn.setRequestMethod("GET");
+      conn.connect();
+      conn.getOutputStream().flush();
+
+      InputStream is = null;
+
+      try
+        {
+        is = conn.getInputStream();
+        int ch;
+        StringBuilder sb = new StringBuilder();
+        while( ( ch = is.read() ) != -1 )
+          {
+          sb.append( (char)ch );
+          }
+        mScores = sb.toString();
+        }
+      catch(Exception e)
+        {
+        android.util.Log.e("downloader", "biffed it getting HTTPResponse");
+        }
+      finally
+        {
+        try
+          {
+          if (is != null)
+            is.close();
+          }
+        catch (Exception e) {}
+        }
+      }
+    catch( IOException ioe )
+      {
+      android.util.Log.e("downloader", "IOException: "+ioe.getMessage());
+      }
+    catch( SecurityException se )
+      {
+      android.util.Log.e("downloader", "SecurityException: "+se.getMessage());
+      }
+
+/*
 mScores =
 
 "0 0 0 INEED7X7X7 1 rus" + "\n" +
@@ -191,6 +322,8 @@ mScores =
 "3 3 2 INEED7X7X7 24 rus" + "\n" +
 "3 3 3 RUBIK123 30 lit" + "\n" +
 "3 3 4 SKY16 31 usa";
+
+ */
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -208,21 +341,14 @@ mScores =
     mScores = "";
     }
 
-///////////////////////////////////////////////////////////////////////////////////////////////////
-
-  void abortNetworkTransaction()
-    {
-    mRunning = false;
-    }
-
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
   void download(Receiver receiver)
     {
     mReceiver = receiver;
     mMode = DOWNLOAD;
-    mNetworkThrd = new Thread(this);
-    mNetworkThrd.start();
+    Thread networkThrd = new Thread(this);
+    networkThrd.start();
     }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////