Solution dark photos

AndroidManifest.xml

@@ -162,11 +162,7 @@
         <activity
             android:name="com.prey.activities.SimpleCameraActivity"
             android:theme="@style/Theme.Transparent" 
-            android:configChanges="keyboardHidden" />     
-        <activity
-            android:name="com.prey.activities.SimpleCameraActivity2"
-            android:theme="@style/Theme.Transparent" 
-            android:configChanges="keyboardHidden" /> 
+            android:configChanges="keyboardHidden" />
         <activity
             android:name="com.prey.activities.SimpleVideoActivity"
              android:theme="@style/Theme.Transparent" 

src/com/prey/actions/picture/PictureUtil.java

@@ -13,7 +13,7 @@
 import com.prey.actions.HttpDataService;
 import com.prey.actions.camera.CameraAction;
 
-import com.prey.activities.SimpleCameraActivity2;
+import com.prey.activities.SimpleCameraActivity;
 import com.prey.net.http.EntityFile;
 
 public class PictureUtil {
@@ -64,10 +64,10 @@ public static HttpDataService getPicture(Context ctx) {
 
 	private static byte[] getPicture(Context ctx, String focus) {
 		AudioManager mgr = null;
-		SimpleCameraActivity2.dataImagen = null;
+		SimpleCameraActivity.dataImagen = null;
 		int streamType = AudioManager.STREAM_SYSTEM;
-		SimpleCameraActivity2.activity = null;
-		Intent intent = new Intent(ctx, SimpleCameraActivity2.class);
+		SimpleCameraActivity.activity = null;
+		Intent intent = new Intent(ctx, SimpleCameraActivity.class);
 		intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
 		intent.putExtra("focus", focus);
 		ctx.startActivity(intent);
@@ -76,17 +76,17 @@ private static byte[] getPicture(Context ctx, String focus) {
 		mgr.setStreamSolo(streamType, true);
 		mgr.setRingerMode(AudioManager.RINGER_MODE_SILENT);
 		mgr.setStreamMute(streamType, true);
-		while (SimpleCameraActivity2.activity == null&& SimpleCameraActivity2.camera ==null && i < 20) {
+		while (SimpleCameraActivity.activity == null&& i < 20) {
 			try {
 				Thread.sleep(1000);
 			} catch (InterruptedException e) {
 			}
 			PreyLogger.d("esperando antes take picture[" + i + "]");
 			i++;
 		}
-		if (SimpleCameraActivity2.activity != null&&SimpleCameraActivity2.camera != null) {
+		if (SimpleCameraActivity.activity != null) {
 			PreyLogger.d("takePicture activity no nulo");
-			SimpleCameraActivity2.activity.takePicture(focus);
+			SimpleCameraActivity.activity.takePicture(focus);
 		} else {
 			PreyLogger.d("takePicture activity nulo");
 		}
@@ -99,7 +99,7 @@ private static byte[] getPicture(Context ctx, String focus) {
 		mgr.setStreamMute(streamType, false);
 		try {
 			i = 0;
-			while (SimpleCameraActivity2.activity != null && SimpleCameraActivity2.dataImagen == null && i < 20) {
+			while (SimpleCameraActivity.activity != null && SimpleCameraActivity.dataImagen == null && i < 20) {
 				Thread.sleep(2000);
 				i++;
 				PreyLogger.d("falta imagen[" + i + "]");
@@ -108,11 +108,11 @@ private static byte[] getPicture(Context ctx, String focus) {
 			PreyLogger.i("Error, causa:" + e.getMessage());
 		}
 		byte[] out=null;
-		if (SimpleCameraActivity2.activity != null) {
-			out=SimpleCameraActivity2.dataImagen;
-			SimpleCameraActivity2.activity.finish();
-			SimpleCameraActivity2.activity=null;
-			SimpleCameraActivity2.dataImagen=null;
+		if (SimpleCameraActivity.activity != null) {
+			out=SimpleCameraActivity.dataImagen;
+			SimpleCameraActivity.activity.finish();
+			SimpleCameraActivity.activity=null;
+			SimpleCameraActivity.dataImagen=null;
 
 		}
 		return out;