properly fix live wallpaper issues

the problem was simply due to the save/restore style functionality

Author: codeanticode

core/src/processing/a2d/PGraphicsAndroid2D.java

@@ -238,7 +238,10 @@ public void endDraw() {
           }
         } finally {
           if (screen != null) {
-            parent.getSurfaceHolder().unlockCanvasAndPost(screen);
+            try {
+              parent.getSurfaceHolder().unlockCanvasAndPost(screen);
+            } catch (IllegalStateException ex) {
+            }
           }
         }
       }

core/src/processing/android/PWallpaper.java

@@ -23,23 +23,18 @@
 package processing.android;
 
 import android.service.wallpaper.WallpaperService;
-//import android.util.DisplayMetrics;
 import android.view.MotionEvent;
 import android.view.SurfaceHolder;
 import android.view.WindowManager;
 import processing.core.PApplet;
 import android.util.DisplayMetrics;
-import android.util.Log;
 import android.os.Build;
-//import android.view.WindowManager;
 import android.view.Display;
 import android.graphics.Point;
 
 public class PWallpaper extends WallpaperService implements AppComponent {
   String TAG = "PWallpaper";
 
-  private PApplet sketch;
-
   protected Point size;
   private DisplayMetrics metrics;
   protected PEngine engine;
@@ -92,11 +87,11 @@ public float getDisplayDensity() {
   }
 
   public void setSketch(PApplet sketch) {
-//    engine.sketch = sketch;
+    engine.sketch = sketch;
   }
 
   public PApplet getSketch() {
-    return sketch;
+    return engine.sketch;
   }
 
   public PApplet createSketch() {
@@ -129,33 +124,17 @@ public Engine onCreateEngine() {
   }
 
   public class PEngine extends Engine {
+    protected PApplet sketch;
 
     @Override
     public void onCreate(SurfaceHolder surfaceHolder) {
       super.onCreate(surfaceHolder);
-      if (sketch == null || isPreview()) {
-        // Creating the sketch for the first time, this means that we are
-        // in preview mode
-        sketch = createSketch();
-        sketch.initSurface(PWallpaper.this, getSurfaceHolder());
-        sketch.startSurface();
-        // By default we don't get touch events, so enable them.
-        setTouchEventsEnabled(true);
-      } else {
-        // Sketch already exists, so we are launching the "real" wallpaper.
-        // Since the containing process is still the same, we don't want to
-        // recreate the sketch and all associated resources (renderer, etc) not
-        // only to keep resource usage/starting times low, but also because
-        // otherwise strange things might happen (e.g.: static variables in places
-        // like PConstants are zeroed when the preview instance is disposed, but
-        // still accessed by the new instance).
-        sketch.resetSurface(PWallpaper.this, getSurfaceHolder());
-        sketch.startSurface();
-      }
-      if (sketch != null) {
-        sketch.preview = isPreview();
-        if (!sketch.preview) requestPermissions();
-      }
+      sketch = createSketch();
+      sketch.initSurface(PWallpaper.this, getSurfaceHolder());
+      sketch.startSurface();
+      sketch.preview = isPreview();
+      if (isPreview()) requestPermissions();
+      setTouchEventsEnabled(true);
     }
 
     @Override
@@ -174,7 +153,7 @@ public void onSurfaceChanged(final SurfaceHolder holder, final int format,
 
     @Override
     public void onVisibilityChanged(boolean visible) {
-      if (!isPreview() && sketch != null) {
+      if (sketch != null) {
         if (visible) {
           sketch.onResume();
         } else {
@@ -191,7 +170,9 @@ public void onVisibilityChanged(boolean visible) {
     @Override
     public void onTouchEvent(MotionEvent event) {
       super.onTouchEvent(event);
-      if (sketch != null) sketch.surfaceTouchEvent(event);
+      if (sketch != null) {
+        sketch.surfaceTouchEvent(event);
+      }
     }
 
     @Override
@@ -204,23 +185,26 @@ public void onOffsetsChanged(float xOffset, float yOffset,
 
     @Override
     public void onSurfaceDestroyed(SurfaceHolder holder) {
-      // This is called immediately before a surface is being destroyed. After returning from this
-      // call, you should no longer try to access this surface. If you have a rendering thread that
-      // directly accesses the surface, you must ensure that thread is no longer touching the
-      // Surface before returning from this function.
+      // This is called immediately before a surface is being destroyed.
+      // After returning from this call, you should no longer try to access this
+      // surface. If you have a rendering thread that directly accesses the
+      // surface, you must ensure that thread is no longer touching the Surface
+      // before returning from this function.
       super.onSurfaceDestroyed(holder);
     }
 
     @Override
     public void onDestroy() {
       super.onDestroy();
-      if (!isPreview() && sketch != null) {
+      if (sketch != null) {
         sketch.onDestroy();
       }
     }
 
     public void onPermissionsGranted() {
-      if (sketch != null) sketch.onPermissionsGranted();
+      if (sketch != null) {
+        sketch.onPermissionsGranted();
+      }
     }
   }
 }

core/src/processing/core/PApplet.java

@@ -520,40 +520,6 @@ public void initSurface(LayoutInflater inflater, ViewGroup container,
     if (DEBUG) println("Done with init surface");
   }
 
-  public void resetSurface(AppComponent component, SurfaceHolder holder) {
-    parentLayout = -1;
-    resetSurface(null, null,  null, component, holder);
-  }
-
-  public void resetSurface(LayoutInflater inflater, ViewGroup container,
-                           Bundle savedInstanceState,
-                           AppComponent component, SurfaceHolder holder) {
-    if (surface != null) {
-      // Don't kill the process (activity or service) after stopping the
-      // animation thread, otherwise the app will just quit. This in particular
-      // is needed by live wallpapers (since the preview and real wallpaper are
-      // the same service process).
-      surface.stopThread(false);
-      surface.dispose();
-    }
-    surface = g.createSurface(component, holder, true);
-
-    if (parentLayout == -1) {
-      setFullScreenVisibility();
-      surface.initView(width, height);
-    } else {
-      surface.initView(inflater, container, savedInstanceState,
-                       fullScreen, width, height);
-    }
-
-    // Reset frame count to start from setup() again
-    frameCount = 0;
-
-    finished = false;
-    looping = true;
-    redraw = true;
-  }
-
 
   public void startSurface() {
     surface.startThread();
@@ -614,8 +580,9 @@ public void onResume() {
 
   public void onPause() {
     // TODO need to save all application state here!
-    // At least we save the current style.
-    if (g != null) {
+    // At least we save the current style (once we had at least drawn one
+    // frame, otherwise we might be saving a "null" style with all zeroes).
+    if (g != null && 0 < frameCount) {
       savedStyle = new PStyle();
       g.getStyle(savedStyle);
     }
@@ -2770,17 +2737,13 @@ final public void dispose() {
     // moved here from stop()
     finished = true;  // let the sketch know it is shut down time
 
-    // don't run stop and disposers twice
-//    if (thread == null) return;
-//    thread = null;
-
     // call to shut down renderer, in case it needs it (pdf does)
-//    if (surface != null) surface.dispose();
-    if (surface != null && surface.stopThread()) { // TODO stopping the thread for good?
-      if (g != null) {
-        g.dispose(); // TODO this would call PSurface.finish(), and so quit activity... but shouldn't
-        surface.dispose();
-      }
+    if (surface != null) {
+      surface.stopThread();
+      surface.dispose();
+    }
+    if (g != null) {
+      g.dispose();
     }
 
     handleMethods("dispose");

core/src/processing/core/PSurface.java

@@ -87,8 +87,6 @@ public void initView(LayoutInflater inflater, ViewGroup container,
 
   public boolean stopThread();
 
-  public boolean stopThread(boolean killProc);
-
   public boolean isStopped();
 
   public void finish();

core/src/processing/core/PSurfaceNone.java

@@ -66,8 +66,6 @@ public class PSurfaceNone implements PSurface, PConstants {
   protected float frameRateTarget = 60;
   protected long frameRatePeriod = 1000000000L / 60L;
 
-  protected boolean killProcAfterStop = true;
-
   @Override
   public Context getContext() {
     if (component.getKind() == AppComponent.FRAGMENT) {
@@ -351,19 +349,14 @@ public void resumeThread() {
 
   @Override
   public boolean stopThread() {
-    return stopThread(true);
-  }
-
-  @Override
-  public boolean stopThread(boolean killProc) {
-    killProcAfterStop = killProc;
     if (thread == null) {
       return false;
     }
     thread = null;
     return true;
   }
 
+
   @Override
   public boolean isStopped() {
       return thread == null;
@@ -453,7 +446,7 @@ public void run() {  // not good to make this synchronized, locks things up
         beforeTime = System.nanoTime();
       }
 
-      if (killProcAfterStop) finish();
+      finish();
     }
   }
 }

core/src/processing/opengl/PSurfaceGLES.java

@@ -50,11 +50,6 @@ public class PSurfaceGLES extends PSurfaceNone {
   public PGLES pgl;
   private SketchSurfaceViewGL glsurf;
 
-  /** The renderer object driving the rendering loop, analogous to the
-   * GLEventListener in JOGL */
-  protected AndroidRenderer renderer;
-  protected AndroidConfigChooser configChooser;
-
   public PSurfaceGLES() { }
 
   public PSurfaceGLES(PGraphics graphics, AppComponent component, SurfaceHolder holder) {
@@ -242,8 +237,9 @@ public boolean onKeyUp(int code, android.view.KeyEvent event) {
 
 
   public AndroidRenderer getRenderer() {
-    renderer = new AndroidRenderer();
-    return renderer;
+//    renderer = new AndroidRenderer();
+//    return renderer;
+    return new AndroidRenderer();
   }
 
 
@@ -253,15 +249,13 @@ public AndroidContextFactory getContextFactory() {
 
 
   public AndroidConfigChooser getConfigChooser(int samples) {
-    configChooser = new AndroidConfigChooser(5, 6, 5, 4, 16, 1, samples);
-    return configChooser;
+    return new AndroidConfigChooser(5, 6, 5, 4, 16, 1, samples);
   }
 
 
   public AndroidConfigChooser getConfigChooser(int r, int g, int b, int a,
                                                int d, int s, int samples) {
-    configChooser = new AndroidConfigChooser(r, g, b, a, d, s, samples);
-    return configChooser;
+    return new AndroidConfigChooser(r, g, b, a, d, s, samples);
   }