Fix errors for when the CK server is unreachable.

Author: psyhtest

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

@@ -689,7 +689,7 @@ protected String doInBackground(String... arg0) {
 
                 try {
                     if (getCurl() == null) {
-                        publishProgress("\n Error we could not load scenarios from Collective Knowledge server: it's not reachible ...");
+                        publishProgress("\n Failed to load scenarios: the CK server is unreachable ...");
                         return null;
                     }
                     availableScenariosRequest.put("remote_server_url", getCurl());
@@ -984,10 +984,10 @@ public void run() {
                     }
                     publishProgress("\nRecognition result:" + recognitionResultText);
 
-                    publishProgress("Submitting results and unexpected behavior (if any) to Collective Knowledge Aggregator ...\n");
+                    publishProgress("Submitting results and unexpected behavior (if any) to the Collective Knowledge Aggregator ...\n");
 
                     if (getCurl() == null) {
-                        publishProgress("\n Error we could not submit recognition results to Collective Knowledge server: it's not reachible ...");
+                        publishProgress("\n Failed to submit recognition results: the CK server is unreachable ...");
                         return null;
                     }
                     JSONObject publishRequest = new JSONObject();

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

@@ -90,9 +90,9 @@ public static JSONObject loadPlatformFeaturesFromServer() {
         AppLogger.logMessage("User ID: " + AppConfigService.getEmail() + "\n");
 
         AppLogger.logMessage("\n");
-        AppLogger.logMessage("Testing Collective Knowledge server ...\n");
+        AppLogger.logMessage("Testing the Collective Knowledge server ...\n");
         if (AppConfigService.getRemoteServerURL() == null) {
-            AppLogger.logMessage("\n Error Collective Knowledge server is not reachible ...\n\n");
+            AppLogger.logMessage("\n Failed: the CK server is unreachable ...\n\n");
             return null;
         }
         requestObject = new JSONObject();
@@ -300,9 +300,9 @@ public static JSONObject loadPlatformFeaturesFromServer() {
 
             // If CPU is still empty, send report to CK to fix ...
             if (pf_cpu.equals("")) {
-                AppLogger.logMessage("\nPROBLEM: we could not detect CPU name and features on your device :( ! Please, report to authors!\n\n");
+                AppLogger.logMessage("\nERROR: unable to detect the CPU name and features of your device :( ! Please report to the authors!\n\n");
                 if (AppConfigService.getRemoteServerURL() == null) {
-                    AppLogger.logMessage("\n Error we could not report about CPU name and feature detection problem to Collective Knowledge server: it's not reachible ...\n\n");
+                    AppLogger.logMessage("\n Failed to report the CPU name and feature detection problem: the CK server is unreachable ...\n\n");
                     return null;
                 }
                 requestObject = new JSONObject();
@@ -490,7 +490,7 @@ public static JSONObject loadPlatformFeaturesFromServer() {
         String j_gpu_uid = "";
         String j_sys_uid = "";
 
-        AppLogger.logMessage("Exchanging info about your platform with CK server to retrieve latest meta for crowdtuning ...");
+        AppLogger.logMessage("Exchanging platform info with the CK server to retrieve the latest crowdtuning meta info ...");
 
         requestObject = new JSONObject();
         JSONObject platformFeatures = new JSONObject();
@@ -509,7 +509,7 @@ public static JSONObject loadPlatformFeaturesFromServer() {
             platformFeatures.put("features", ft_os);
 
             if (AppConfigService.getRemoteServerURL() == null) {
-                AppLogger.logMessage("\n Error we could not exchange platform info with Collective Knowledge server: it's not reachible ...\n\n");
+                AppLogger.logMessage("\n Failed to exchange platform info: the CK server is unreachable ...\n\n");
                 return null;
             }
             requestObject.put("remote_server_url", AppConfigService.getRemoteServerURL());//
@@ -663,7 +663,7 @@ public static JSONObject loadPlatformFeaturesFromServer() {
             platformFeatures.put("features", ft_cpu);
 
             if (AppConfigService.getRemoteServerURL() == null) {
-                AppLogger.logMessage("\n Error we could not exchange platform info with Collective Knowledge server: it's not reachible ...\n\n");
+                AppLogger.logMessage("\n Failed to exchange platform info: the CK server is unreachable ...\n\n");
                 return null;
             }
             requestObject.put("remote_server_url", AppConfigService.getRemoteServerURL());//
@@ -734,7 +734,7 @@ public static JSONObject loadPlatformFeaturesFromServer() {
             platformFeatures.put("features", ft_plat);
 
             if (AppConfigService.getRemoteServerURL() == null) {
-                AppLogger.logMessage("\n Error we could not exchange platform info with Collective Knowledge server: it's not reachible ...\n\n");
+                AppLogger.logMessage("\n Failed to exchange platform info: the CK server is unreachable ...\n\n");
                 return null;
             }
             requestObject.put("remote_server_url", AppConfigService.getRemoteServerURL());//

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

@@ -121,7 +121,7 @@ public static void loadRecognitionScenariosFromServer() {
         try {
             String remoteServerURL = AppConfigService.getRemoteServerURL();
             if (remoteServerURL == null) {
-                AppLogger.logMessage("\n Error we could not load scenarios from Collective Knowledge server: it's not reachible ...\n\n");
+                AppLogger.logMessage("\n Failed to load scenarios: the CK server is unreachable ...\n\n");
                 return;
             }
             availableScenariosRequest.put("remote_server_url", remoteServerURL);