Arreglado bug por el cual si en la vista de editar picto le dabas a atras en la…

Arreglado bug por el cual si en la vista de editar picto le dabas a atras en la botonera, la aplicación petaba

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictogramActivity.java

@@ -1127,8 +1127,6 @@ protected void showOnlyTape(boolean onlyTape) {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         super.onActivityResult(requestCode, resultCode, data);
         
         
-        boolean edit =  data.getBooleanExtra("tipo",false);
-
         Bitmap imagen = null;
         Bitmap imagen = null;
           switch(requestCode) {
           switch(requestCode) {
               case CAMERA_PIC_REQUEST: //Captura de foto
               case CAMERA_PIC_REQUEST: //Captura de foto
@@ -1151,7 +1149,7 @@ protected void showOnlyTape(boolean onlyTape) {
                   break;
                   break;
               case EditPictoActivity.EDIT_PICTO_REQUEST:
               case EditPictoActivity.EDIT_PICTO_REQUEST:
                   if (resultCode == RESULT_OK) {
                   if (resultCode == RESULT_OK) {
-
+                      boolean edit =  data.getBooleanExtra("tipo",false);
                       int row = edit ? data.getExtras().getInt(Picto.JSON_ATTTRS.ROW) : getIntent().getIntExtra(Picto.JSON_ATTTRS.ROW, -1);
                       int row = edit ? data.getExtras().getInt(Picto.JSON_ATTTRS.ROW) : getIntent().getIntExtra(Picto.JSON_ATTTRS.ROW, -1);
                       int col = edit ? data.getExtras().getInt(Picto.JSON_ATTTRS.COLUMN) : getIntent().getIntExtra(Picto.JSON_ATTTRS.COLUMN, -1);
                       int col = edit ? data.getExtras().getInt(Picto.JSON_ATTTRS.COLUMN) : getIntent().getIntExtra(Picto.JSON_ATTTRS.COLUMN, -1);
                       int freeRow = edit ? data.getExtras().getInt(Picto.JSON_ATTTRS.FREE_ROW) : getIntent().getIntExtra(Picto.JSON_ATTTRS.FREE_ROW, -1);
                       int freeRow = edit ? data.getExtras().getInt(Picto.JSON_ATTTRS.FREE_ROW) : getIntent().getIntExtra(Picto.JSON_ATTTRS.FREE_ROW, -1);

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/cropper/EditPictoActivity.java

@@ -19,6 +19,7 @@ import android.support.annotation.NonNull;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.ActivityCompat;
 import android.util.DisplayMetrics;
 import android.util.DisplayMetrics;
 import android.util.Log;
 import android.util.Log;
+import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.View;
 import android.view.Window;
 import android.view.Window;
@@ -490,6 +491,16 @@ public class EditPictoActivity extends Activity {
         }
         }
     }
     }
 
 
+    @Override
+    public boolean onKeyDown(int keyCode, KeyEvent event) {
+        if (keyCode == KeyEvent.KEYCODE_BACK) {
+            finish();
+            setResult(RESULT_CANCELED, getIntent());
+            return true;
+        }
+        return super.onKeyDown(keyCode, event);
+    }
+
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
         super.onActivityResult(requestCode, resultCode, data);