Remove debug flags

Signed-off-by: Jorge Ruesga <jorge@ruesga.com>

6 files changed, 16 insertions, 23 deletions

diff --git a/src/org/cyanogenmod/wallpapers/photophase/GLESUtil.java b/src/org/cyanogenmod/wallpapers/photophase/GLESUtil.java
index a6de6fd..3183ff4 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/GLESUtil.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/GLESUtil.java
@@ -38,7 +38,7 @@ public final class GLESUtil {
 
     private static final String TAG = "GLESUtil";
 
-    private static final boolean DEBUG = true;
+    private static final boolean DEBUG = false;
 
     /**
      * A helper class to deal with OpenGL float colors.
@@ -201,8 +201,7 @@ public final class GLESUtil {
         int shader = GLES20.glCreateShader(type);
         GLESUtil.glesCheckError("glCreateShader");
         if (shader <= 0) {
-            String msg = "Cannot create a shader";
-            if (DEBUG) Log.e(TAG, msg);
+            Log.e(TAG, "Cannot create a shader");
             return 0;
         }
         GLES20.glShaderSource(shader, src);
@@ -316,8 +315,7 @@ public final class GLESUtil {
             // Decode and associate the bitmap (invert the desired dimensions)
             bitmap = BitmapUtils.decodeBitmap(file, dimensions.height(), dimensions.width());
             if (bitmap == null) {
-                String msg = "Failed to decode the file bitmap";
-                if (DEBUG) Log.e(TAG, msg);
+                Log.e(TAG, "Failed to decode the file bitmap");
                 return new GLESTextureInfo();
             }
 
@@ -328,7 +326,7 @@ public final class GLESUtil {
 
         } catch (Exception e) {
             String msg = "Failed to generate a valid texture from file: " + file.getAbsolutePath();
-            if (DEBUG) Log.e(TAG, msg, e);
+            Log.e(TAG, msg, e);
             return new GLESTextureInfo();
 
         } finally {
@@ -359,7 +357,7 @@ public final class GLESUtil {
             bitmap = BitmapUtils.decodeBitmap(raw);
             if (bitmap == null) {
                 String msg = "Failed to decode the resource bitmap";
-                if (DEBUG) Log.e(TAG, msg);
+                Log.e(TAG, msg);
                 return new GLESTextureInfo();
             }
 
@@ -369,7 +367,7 @@ public final class GLESUtil {
 
         } catch (Exception e) {
             String msg = "Failed to generate a valid texture from resource: " + resourceId;
-            if (DEBUG) Log.e(TAG, msg, e);
+            Log.e(TAG, msg, e);
             return new GLESTextureInfo();
 
         } finally {
@@ -408,8 +406,7 @@ public final class GLESUtil {
         GLES20.glGenTextures(num, textureNames, 0);
         GLESUtil.glesCheckError("glGenTextures");
         if (textureNames[0] <= 0 || (effect != null && textureNames[1] <= 0)) {
-            String msg = "Failed to generate a valid texture";
-            if (DEBUG) Log.e(TAG, msg);
+            Log.e(TAG, "Failed to generate a valid texture");
             return new GLESTextureInfo();
         }
 
@@ -430,8 +427,7 @@ public final class GLESUtil {
         // Load the texture
         GLUtils.texImage2D(GLES20.GL_TEXTURE_2D, 0, bitmap, 0);
         if (!GLES20.glIsTexture(textureNames[0])) {
-            String msg = "Failed to load a valid texture";
-            if (DEBUG) Log.e(TAG, msg);
+            Log.e(TAG, "Failed to load a valid texture");
             return new GLESTextureInfo();
         }
 
@@ -466,10 +462,8 @@ public final class GLESUtil {
     public static boolean glesCheckError(String func) {
         int error = GLES20.glGetError();
         if (error != 0) {
-            if (DEBUG) {
-                Log.e(TAG, "GLES20 Error (" + glesGetErrorModule() + ") (" + func + "): " +
-                        GLUtils.getEGLErrorString(error));
-            }
+            Log.e(TAG, "GLES20 Error (" + glesGetErrorModule() + ") (" + func + "): " +
+                    GLUtils.getEGLErrorString(error));
             return true;
         }
         return false;
@@ -509,8 +503,7 @@ public final class GLESUtil {
             }
             return sb.toString();
         } catch (Exception e) {
-            String msg = "Failed to read the resource " + resId;
-            if (DEBUG) Log.e(TAG, msg);
+            Log.e(TAG, "Failed to read the resource " + resId);
             return null;
         } finally {
             try {
diff --git a/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseActivity.java b/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseActivity.java
index 53d2ce1..6469a18 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseActivity.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseActivity.java
@@ -40,7 +40,7 @@ public class PhotoPhaseActivity extends Activity implements OnTouchListener {
 
     private static final String TAG = "PhotoPhaseActivity";
 
-    private static final boolean DEBUG = true;
+    private static final boolean DEBUG = false;
 
     private GLSurfaceView mGLSurfaceView;
     private PhotoPhaseRenderer mRenderer;
diff --git a/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseRenderer.java b/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseRenderer.java
index 1ea7bec..62eb6ae 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseRenderer.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseRenderer.java
@@ -53,7 +53,7 @@ public class PhotoPhaseRenderer implements GLSurfaceView.Renderer {
 
     private static final String TAG = "PhotoPhaseRenderer";
 
-    private static final boolean DEBUG = true;
+    private static final boolean DEBUG = false;
 
     private final long mInstance;
     private static long sInstances;
diff --git a/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseWallpaper.java b/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseWallpaper.java
index 0c9f23c..5a09b49 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseWallpaper.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/PhotoPhaseWallpaper.java
@@ -41,7 +41,7 @@ public class PhotoPhaseWallpaper
 
     private static final String TAG = "PhotoPhaseWallpaper";
 
-    private static final boolean DEBUG = true;
+    private static final boolean DEBUG = false;
 
     private List<PhotoPhaseRenderer> mRenderers;
     private PhotoPhaseWallpaperEngine mEngine;
diff --git a/src/org/cyanogenmod/wallpapers/photophase/preferences/GeneralPreferenceFragment.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/GeneralPreferenceFragment.java
index bbce169..337cd0e 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/preferences/GeneralPreferenceFragment.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/preferences/GeneralPreferenceFragment.java
@@ -42,7 +42,7 @@ public class GeneralPreferenceFragment extends PreferenceFragment {
 
     private static final String TAG = "GeneralPreferenceFragment";
 
-    private static final boolean DEBUG = true;
+    private static final boolean DEBUG = false;
 
     private SeekBarProgressPreference mWallpaperDim;
     private ColorPickerPreference mBackgroundColor;
diff --git a/src/org/cyanogenmod/wallpapers/photophase/preferences/MediaPreferenceFragment.java b/src/org/cyanogenmod/wallpapers/photophase/preferences/MediaPreferenceFragment.java
index f4348c6..e03116e 100644
--- a/src/org/cyanogenmod/wallpapers/photophase/preferences/MediaPreferenceFragment.java
+++ b/src/org/cyanogenmod/wallpapers/photophase/preferences/MediaPreferenceFragment.java
@@ -36,7 +36,7 @@ public class MediaPreferenceFragment extends PreferenceFragment {
 
     private static final String TAG = "MediaPreferenceFragment";
 
-    private static final boolean DEBUG = true;
+    private static final boolean DEBUG = false;
 
     ListPreference mRefreshInterval;
     Preference mRefreshNow;