fix issue after merge

Live2Leave · Feb 20, 2019 · 459b5f0 · 459b5f0
1 parent 43c6810
commit 459b5f0
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/android/src/main/java/com/ahmedadeltito/photoeditor/PhotoEditorActivity.java b/android/src/main/java/com/ahmedadeltito/photoeditor/PhotoEditorActivity.java
@@ -382,6 +382,7 @@ public void onTick(long millisUntilFinished) {
  public void onFinish() {
  String timeStamp = new SimpleDateFormat("yyyyMMdd_HHmmss").format(new Date());
  String imageName = "IMG_" + timeStamp + ".jpg";
+ Intent returnIntent = new Intent();
 
  if (isSDCARDMounted()) {
  String folderName = "PhotoEditorSDK";
@@ -391,6 +392,7 @@ public void onFinish() {
  }
 
  String selectedOutputPath = mediaStorageDir.getPath() + File.separator + imageName;
+ returnIntent.putExtra("imagePath", selectedOutputPath);
  Log.d("PhotoEditorSDK", "selected camera path " + selectedOutputPath);
  File file = new File(selectedOutputPath);
 
@@ -408,7 +410,6 @@ public void onFinish() {
  }
  }
 
- Intent returnIntent = new Intent();
  setResult(Activity.RESULT_OK, returnIntent);
  finish();
  }
@@ -453,9 +454,6 @@ public void onFinish() {
  var7.printStackTrace();
  }
 
- Intent returnIntent = new Intent();
- setResult(Activity.RESULT_OK, returnIntent);
-
  Intent returnIntent = new Intent();
  returnIntent.putExtra("imagePath", newPath);
  setResult(Activity.RESULT_OK, returnIntent);