Merge pull request #60 from dividiti/issue-54

GPU is not detected in the new version #54

Author: Daniil Efremov

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

@@ -579,20 +579,20 @@ public void setGpuVendor(String gpuVendor) {
         public JSONObject toJSONObject() {
             JSONObject jsonObject = new JSONObject();
             try {
-                jsonObject.put(EMAIL, getEmail());
-                jsonObject.put(ACTUAL_IMAGE_PATH, getActualImagePath());
-                jsonObject.put(REMOTE_SERVER_URL, getRemoteServerURL());
-                jsonObject.put(RECOGNITION_RESULT_TEXT, getRecognitionResultText());
-                jsonObject.put(DATA_UID, getDataUID());
-                jsonObject.put(BEHAVIOR_UID, getBehaviorUID());
-                jsonObject.put(CROWD_ID, getCrowdUID());
-                jsonObject.put(SELECTED_RECOGNITION_SCENARIO, getSelectedRecognitionScenario());
-                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());
-                jsonObject.put(GPU, getGPU());
-                jsonObject.put(GPU_VENDOR, getGpuVendor());
+                jsonObject.put(EMAIL, this.getEmail());
+                jsonObject.put(ACTUAL_IMAGE_PATH, this.getActualImagePath());
+                jsonObject.put(REMOTE_SERVER_URL, this.getRemoteServerURL());
+                jsonObject.put(RECOGNITION_RESULT_TEXT, this.getRecognitionResultText());
+                jsonObject.put(DATA_UID, this.getDataUID());
+                jsonObject.put(BEHAVIOR_UID, this.getBehaviorUID());
+                jsonObject.put(CROWD_ID, this.getCrowdUID());
+                jsonObject.put(SELECTED_RECOGNITION_SCENARIO, this.getSelectedRecognitionScenario());
+                jsonObject.put(STATE_PARAM, this.getState() == null? null : this.getState().name());
+                jsonObject.put(LOCAL_APP_PATH, this.getLocalAppPath());
+                jsonObject.put(PREVIEW_RECOGNITION_TEXT, this.getPreviewRecognitionText());
+                jsonObject.put(RESULT_URL, this.getResultURL());
+                jsonObject.put(GPU, this.getGpu());
+                jsonObject.put(GPU_VENDOR, this.getGpuVendor());
 
             } catch (JSONException e) {
                 AppLogger.logMessage("ERROR could not serialize app config to json format");

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

@@ -34,6 +34,7 @@
 import android.provider.MediaStore;
 import android.text.Html;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.Button;
@@ -365,7 +366,7 @@ public void run() {
 
         this.glSurfaceView = new GLSurfaceView(this);
         this.glSurfaceView.setRenderer(this);
-
+        ((ViewGroup) imageView.getParent()).addView(this.glSurfaceView);
 
         initAppConfig(this);