Merge pull request #52 from dividiti/issue-final

final pre release issues

Author: Daniil Efremov

app/src/main/java/openscience/crowdsource/video/experiments/AppConfigService.java

@@ -80,6 +80,7 @@ public Thread newThread(Runnable r) {
     public static final Executor THREAD_POOL_EXECUTOR
             = new ThreadPoolExecutor(CORE_POOL_SIZE, MAXIMUM_POOL_SIZE, KEEP_ALIVE,
             TimeUnit.SECONDS, sPoolWorkQueue, sThreadFactory);
+    public static final String OLD_VERSION_FILE_NAME = "email.txt";
 
     private static Updater previewRecognitionTextUpdater;
 
@@ -324,18 +325,45 @@ synchronized public static void updateState(AppConfig.State state) {
         saveAppConfig(appConfig);
     }
 
+    private static String tryGetOldEmail() {
+        String oldEmail = Utils.readOneStringFile(APP_CONFIG_DIR + File.separator + OLD_VERSION_FILE_NAME);
+        if (oldEmail != null) {
+            updateEmail(oldEmail);
+            return oldEmail;
+        } else {
+            return "";
+        }
+    }
+
     synchronized public static String getEmail() {
         AppConfig appConfig = loadAppConfig();
         if (appConfig == null) {
-            return "";
+            return tryGetOldEmail();
         }
         String email = appConfig.getEmail();
         if (email == null) {
-            return "";
+            return tryGetOldEmail();
         }
         return email;
     }
 
+    synchronized public static void updateResultURL(String value) {
+        AppConfig appConfig = loadAppConfig();
+        if (appConfig == null) {
+            appConfig = new AppConfig();
+        }
+        appConfig.setResultURL(value);
+        saveAppConfig(appConfig);
+    }
+
+    synchronized public static String getResultURL() {
+        AppConfig appConfig = loadAppConfig();
+        if (appConfig == null) {
+            return null;
+        }
+        return appConfig.getResultURL();
+    }
+
     public static void saveAppConfig(AppConfig appConfig) {
         try {
             JSONObject scenariosJSON = appConfig.toJSONObject();
@@ -380,6 +408,7 @@ public enum State {
         public static final String BEHAVIOR_UID = "behavior_uid";
         public static final String STATE_PARAM = "state";
         public static final String LOCAL_APP_PATH = "local_app_path";
+        public static final String RESULT_URL = "result_url";
 
         private String email;
         private String actualImagePath;
@@ -393,6 +422,7 @@ public enum State {
         private State state;
         private String localAppPath;
         private String previewRecognitionText;
+        private String resultURL;
 
         public String getEmail() {
             return email;
@@ -482,6 +512,14 @@ public void setPreviewRecognitionText(String previewRecognitionText) {
             this.previewRecognitionText = previewRecognitionText;
         }
 
+        public String getResultURL() {
+            return resultURL;
+        }
+
+        public void setResultURL(String resultURL) {
+            this.resultURL = resultURL;
+        }
+
         public JSONObject toJSONObject() {
             JSONObject jsonObject = new JSONObject();
             try {
@@ -496,6 +534,7 @@ public JSONObject toJSONObject() {
                 jsonObject.put(STATE_PARAM, getState() == null? null : getState().name());
                 jsonObject.put(LOCAL_APP_PATH, getLocalAppPath());
                 jsonObject.put(PREVIEW_RECOGNITION_TEXT, getPreviewRecognitionText());
+                jsonObject.put(RESULT_URL, getResultURL());
             } catch (JSONException e) {
                 AppLogger.logMessage("ERROR could not serialize app config to json format");
             }
@@ -574,6 +613,12 @@ public static AppConfig fromJSONObject(JSONObject jsonObject) {
             } catch (JSONException e) {
                 // optional param
             }
+
+            try {
+                appConfig.setResultURL(jsonObject.getString(RESULT_URL));
+            } catch (JSONException e) {
+                // optional param
+            }
             return appConfig;
         }
     }

app/src/main/java/openscience/crowdsource/video/experiments/MainActivity.java

@@ -1058,15 +1058,18 @@ public void run() {
                     String status = "";
                     String data_uid = "";
                     String behavior_uid = "";
+                    String resultURL = AppConfigService.URL_CROWD_RESULTS;
 
                     try {
                         status = (String) response.get("status");
                         data_uid = (String) response.get("data_uid");
                         behavior_uid = (String) response.get("behavior_uid");
+                        resultURL = (String) response.get("result_url");
                     } catch (JSONException e) {
                         publishProgress("\nError obtaining key 'status' from OpenME output (" + e.getMessage() + ") ...");
                     }
 
+                    AppConfigService.updateResultURL(resultURL);
                     publishProgress('\n' + status + '\n');
 
                     showIsThatCorrectDialog(recognitionResultText, actualImageFilePath, data_uid, behavior_uid, dataUID);

app/src/main/java/openscience/crowdsource/video/experiments/ResultActivity.java

@@ -81,7 +81,7 @@ public void onClick(View v) {
         }
 
         final TextView crowdResultURL = (TextView) findViewById(R.id.crowdResultURL);
-        crowdResultURL.setText(Html.fromHtml("<a href=\"" + AppConfigService.URL_CROWD_RESULTS + "\">View your results in the public repositor</a>"));
+        crowdResultURL.setText(Html.fromHtml("<a href=\"" + AppConfigService.getResultURL() + "\">View your results in the public repository</a>"));
         crowdResultURL.setOnClickListener(new View.OnClickListener() {
             @SuppressWarnings({"unused", "unchecked"})
             @Override
@@ -114,10 +114,12 @@ public void onClick(View arg0) {
                 Spanned spanned;
                 final EditText edittext = new EditText(ResultActivity.this);
                 edittext.setEnabled(false);
-                int skipIndex = 0; // 0 - mean do not skip
+                int skipIndex = 1; // 0 - mean do not skip
                 if (p == skipIndex) {
                     spanned = Html.fromHtml("<font color='red'><b>" + predictions[p] + "</b></font>");
-                    edittext.setText(predictions[p]);
+                    TextView correctResultvalue = (TextView) findViewById(R.id.predictedResultValue);
+                    correctResultvalue.setText(spanned);
+                    continue;
                 } else if (p == predictions.length){
                     spanned = Html.fromHtml("<font color='#ffffff'><b>Other: _____________________________</b></font>");
                     edittext.setText("");

app/src/main/res/layout/activity_result.xml

@@ -79,18 +79,44 @@
                 />
 
             <TextView
-                android:id="@+id/selectResultText"
-                android:text="Select correct result or suggest your own:"
+                android:id="@+id/predictedResultLabel"
+                android:text="The most likely prediction:"
                 android:textColor="@color/colorTextGreen"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="30dp"
+                android:layout_marginTop="10dp"
                 android:layout_marginLeft="0dp"
                 android:layout_below="@+id/crowdResultURL"
                 android:minHeight="28dp"
                 android:textSize="14sp"
                 />
 
+            <TextView
+                android:id="@+id/predictedResultValue"
+                android:text="predictedResultValue"
+                android:textColor="@color/colorTextWhite"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="0dp"
+                android:layout_marginLeft="0dp"
+                android:layout_below="@+id/predictedResultLabel"
+                android:minHeight="28dp"
+                android:textSize="14sp"
+                />
+
+            <TextView
+                android:id="@+id/selectResultText"
+                android:text="If it's wrong answer, select correct result or suggest your own:"
+                android:textColor="@color/colorTextGreen"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="10dp"
+                android:layout_marginLeft="0dp"
+                android:layout_below="@+id/predictedResultValue"
+                android:minHeight="28dp"
+                android:textSize="14sp"
+                />
+
             <RadioGroup
                 android:id="@+id/rgSelectResultList"
                 android:orientation="vertical"