Closes #87

Merge branch 'fix/camera-cancel' into develop * fix/camera-cancel: Do not continue broadcast if no photo was actually taken
7LPdWcaW · Jun 29, 2019 · 5b6f89b · 5b6f89b
2 parents 576ee0c + caecdeb
commit 5b6f89b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/app/src/main/java/me/anon/grow/fragment/PlantDetailsFragment.java b/app/src/main/java/me/anon/grow/fragment/PlantDetailsFragment.java
@@ -439,10 +439,12 @@ private void setUi()
 				new File(plant.getImages().get(plant.getImages().size() - 1)).delete();
 				plant.getImages().remove(plant.getImages().size() - 1);
 			}
-
-			PlantManager.getInstance().upsert(plantIndex, plant);
-			PlantWidgetProvider.triggerUpdateAll(getActivity());
-			AddonHelper.broadcastImage(getActivity(), plant.getImages().get(plant.getImages().size() - 1), false);
+			else
+			{
+				PlantManager.getInstance().upsert(plantIndex, plant);
+				PlantWidgetProvider.triggerUpdateAll(getActivity());
+				AddonHelper.broadcastImage(getActivity(), plant.getImages().get(plant.getImages().size() - 1), false);
+			}
 		}
 		else if (requestCode == 2)
 		{

diff --git a/app/src/main/java/me/anon/grow/fragment/ViewPhotosFragment.java b/app/src/main/java/me/anon/grow/fragment/ViewPhotosFragment.java
@@ -366,12 +366,14 @@ private void setAdapter()
 				new File(plant.getImages().get(plant.getImages().size() - 1)).delete();
 				plant.getImages().remove(plant.getImages().size() - 1);
 			}
+			else
+			{
+				PlantManager.getInstance().upsert(plantIndex, plant);
+				AddonHelper.broadcastImage(getActivity(), plant.getImages().get(plant.getImages().size() - 1), false);
 
-			PlantManager.getInstance().upsert(plantIndex, plant);
-			AddonHelper.broadcastImage(getActivity(), plant.getImages().get(plant.getImages().size() - 1), false);
-
-			setAdapter();
-			adapter.notifyDataSetChanged();
+				setAdapter();
+				adapter.notifyDataSetChanged();
+			}
 		}
 		else if (requestCode == 3) // choose image from gallery
 		{