From 84353046a5a6b812a93af34faf2517e660220215 Mon Sep 17 00:00:00 2001
From: Niels Zwemmer <niels.zwemmer@student.uva.nl>
Date: Tue, 27 Jun 2017 11:11:29 +0200
Subject: [PATCH] Fixed implement runtime error for Felix. Made some minor
 changes to both strings.xml and ProfilePictureUploader (error when old
 picture not present).

---
 .../main/java/nl/myhyvesbookplus/tagram/MainActivity.java  | 7 ++++++-
 .../tagram/controller/ProfilePictureUploader.java          | 4 +++-
 .../app/src/main/res/values-nl/strings.xml                 | 3 +--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/MainActivity.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/MainActivity.java
index 9d4e938..7c98ae4 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/MainActivity.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/MainActivity.java
@@ -21,7 +21,7 @@ import nl.myhyvesbookplus.tagram.controller.ProfilePictureUploader;
 public class MainActivity extends AppCompatActivity implements
         CameraFragment.OnFragmentInteractionListener,
         ProfilePictureUploader.ProfilePictureUpdatedListener,
-        DownloadClass.PostDownloadListener {
+        DownloadClass.PostDownloadListener, PostUploader.PostUploadListener {
     final static private String TAG = "MainScreen";
 
     FirebaseAuth mAuth;
@@ -130,4 +130,9 @@ public class MainActivity extends AppCompatActivity implements
         frag.startList();
 
     }
+
+    @Override
+    public void PostUploadComplete(Boolean success) {
+
+    }
 }
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/ProfilePictureUploader.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/ProfilePictureUploader.java
index 3264976..65e1de9 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/ProfilePictureUploader.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/controller/ProfilePictureUploader.java
@@ -75,7 +75,9 @@ public class ProfilePictureUploader extends UploadClass {
                     public void onComplete(@NonNull Task<Void> task) {
                         Log.d(TAG, "onComplete: Updated profile picture");
                         mListener.ProfilePictureUpdated(true);
-                        removeOldPicture();
+                        if (oldPicture != null) {
+                            removeOldPicture();
+                        }
                     }
                 });
     }
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
index 79c3196..e38d9a7 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
@@ -29,7 +29,6 @@
     <string name="upload">Uploaden</string>
     <string name="image_save_error">Foto opslaan mislukt. Zorg a.u.b. dat er genoeg ruimte op uw telefoon beschikbaar is.</string>
     <string name="update_profile_pic_error">Het updaten van de profielfoto is mislukt. Controleer uw internetverbinding.</string>
-    <string name="upload_profile_pic">Profielfoto aan het uploaden...</string>
-    <string name="please_wait">Wacht a.u.b.</string>
+    <string name="upload_profile_pic">Profielfoto aan het uploaden…</string>
     <string name="niet_slecht">\"Niet slecht.\"s</string>
 </resources>
\ No newline at end of file