fixes some regressions in service initialization

processing · Jul 22, 2016 · 6ce2ba4 · 6ce2ba4
1 parent d16f087
commit 6ce2ba4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/core/src/processing/android/PWallpaper.java b/core/src/processing/android/PWallpaper.java
@@ -85,7 +85,7 @@ public int getHeight() {
   }
 
   public void setSketch(PApplet sketch) {
-     engine.sketch = sketch;
+//    engine.sketch = sketch;
   }
 
   public PApplet createSketch() {
@@ -108,7 +108,7 @@ public void requestPermissions() {
   }
 
   public void onPermissionsGranted() {
-
+    engine.sketch.onPermissionsGranted();
   }
 
   @Override
@@ -118,8 +118,7 @@ public Engine onCreateEngine() {
   }
 
   public class PEngine extends Engine {
-    private PApplet sketch = null;
-
+    private PApplet sketch;
     @Override
     public void onCreate(SurfaceHolder surfaceHolder) {
       super.onCreate(surfaceHolder);

diff --git a/core/src/processing/android/PWatchFaceCanvas.java b/core/src/processing/android/PWatchFaceCanvas.java
@@ -43,9 +43,9 @@
 
 
 public class PWatchFaceCanvas extends CanvasWatchFaceService implements AppComponent {
+  private PApplet sketch;
   private Point size;
 //  private DisplayMetrics metrics;
-  private PApplet sketch;
   private CEngine engine;
 
   public void initDimensions() {
@@ -101,7 +101,7 @@ public void requestPermissions() {
   }
 
   public void onPermissionsGranted() {
-
+    sketch.onPermissionsGranted();
   }
 
   @Override
@@ -275,6 +275,6 @@ public void onDestroy() {
   @Override
   public void onDestroy() {
     super.onDestroy();
-    sketch.onDestroy();
+    engine.onDestroy();
   }
 }
diff --git a/core/src/processing/android/PWatchFaceGLES.java b/core/src/processing/android/PWatchFaceGLES.java
@@ -41,9 +41,9 @@
 import android.graphics.Rect;
 
 public class PWatchFaceGLES extends Gles2WatchFaceService implements AppComponent {
+  private PApplet sketch;
   private Point size;
 //  private DisplayMetrics metrics;
-  private PApplet sketch;
   private GLEngine engine;
 
   public void initDimensions() {
@@ -98,7 +98,7 @@ public void requestPermissions() {
   }
 
   public void onPermissionsGranted() {
-
+    sketch.onPermissionsGranted();
   }
 
   @Override
@@ -118,7 +118,6 @@ public boolean canDraw() {
   }
 
   private class GLEngine extends Gles2WatchFaceService.Engine {
-
     @Override
     public void onCreate(SurfaceHolder surfaceHolder) {
       super.onCreate(surfaceHolder);
@@ -290,6 +289,6 @@ public void onDestroy() {
   @Override
   public void onDestroy() {
     super.onDestroy();
-    sketch.onDestroy();
+    engine.onDestroy();
   }
 }