added onActivityResult to activity template

Author: codeanticode

mode/libraries/vr/src/processing/vr/PVR.java

@@ -25,6 +25,7 @@
 import com.google.vr.sdk.base.GvrActivity;
 import com.google.vr.sdk.base.Eye;
 
+import android.content.Intent;
 import android.util.DisplayMetrics;
 import processing.android.AppComponent;
 import processing.android.ServiceEngine;
@@ -172,4 +173,30 @@ public void onRequestPermissionsResult(int requestCode,
       sketch.onRequestPermissionsResult(requestCode, permissions, grantResults);
     }
   }
+
+
+  @Override
+  public void onNewIntent(Intent intent) {
+    if (sketch != null) {
+      sketch.onNewIntent(intent);
+    }
+  }
+
+
+  @Override
+  public void onActivityResult(int requestCode, int resultCode, Intent data) {
+    if (sketch != null) {
+      sketch.onActivityResult(requestCode, resultCode, data);
+    }
+  }
+
+
+  @Override
+  public void onBackPressed() {
+    if (sketch != null) {
+      sketch.onBackPressed();
+      if (sketch.handledBackPressed) return;
+    }
+    super.onBackPressed();
+  }
 }

mode/templates/AppActivity.java.tmpl

@@ -28,9 +28,7 @@ public class MainActivity extends AppCompatActivity {
   }
 
   @Override
-  public void onRequestPermissionsResult(int requestCode,
-                                         String permissions[],
-                                         int[] grantResults) {
+  public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
     if (sketch != null) {
       sketch.onRequestPermissionsResult(requestCode, permissions, grantResults);
     }
@@ -43,6 +41,13 @@ public class MainActivity extends AppCompatActivity {
     }  
   }
 
+  @Override
+  public void onActivityResult(int requestCode, int resultCode, Intent data) {
+    if (sketch != null) {
+      sketch.onActivityResult(requestCode, resultCode, data);
+    }
+  }  
+  
   @Override
   public void onBackPressed() {
     if (sketch != null) {

mode/templates/VRActivity.java.tmpl

@@ -6,22 +6,11 @@ import processing.vr.PVR;
 import processing.core.PApplet;
 
 public class MainActivity extends PVR {
-  private PApplet sketch;
-  
   @Override
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    sketch = new @@sketch_class_name@@();
+    PApplet sketch = new @@sketch_class_name@@();
     @@external@@
     setSketch(sketch);
   }
-  
-  @Override
-  public void onBackPressed() {
-    if (sketch != null) {
-      sketch.onBackPressed();
-      if (sketch.handledBackPressed) return;
-    }
-    super.onBackPressed();
-  }  
 }

studio/apps/simple/src/main/java/simple/MainActivity.java

@@ -41,6 +41,13 @@ public void onNewIntent(Intent intent) {
     }
   }
 
+  @Override
+  public void onActivityResult(int requestCode, int resultCode, Intent data) {
+    if (sketch != null) {
+      sketch.onActivityResult(requestCode, resultCode, data);
+    }
+  }
+
   @Override
   public void onBackPressed() {
     if (sketch != null) {

studio/apps/vrcube/src/main/java/vrcube/MainActivity.java

@@ -6,22 +6,11 @@
 import processing.core.PApplet;
 
 public class MainActivity extends PVR {
-  private PApplet sketch;
-
   @Override
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    sketch = new Sketch();
+    PApplet sketch = new Sketch();
     sketch.setExternal(true);
     setSketch(sketch);
   }
-
-  @Override
-  public void onBackPressed() {
-    if (sketch != null) {
-      sketch.onBackPressed();
-      if (sketch.handledBackPressed) return;
-    }
-    super.onBackPressed();
-  }
 }