From 3f00e0959272fd087ec4fdcfeb38ce74224ffdd1 Mon Sep 17 00:00:00 2001
From: Marijn Jansen <therijn@users.noreply.github.com>
Date: Mon, 26 Jun 2017 18:54:45 +0200
Subject: [PATCH 1/2] fix for permissions.

---
 app/MyHyvesBookPlusStagram/app/build.gradle                   | 2 +-
 .../main/java/nl/myhyvesbookplus/tagram/TimeLineAdapter.java  | 1 +
 .../app/src/main/res/values-nl/strings.xml                    | 1 -
 app/MyHyvesBookPlusStagram/app/src/main/res/values/colors.xml | 4 ++--
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/MyHyvesBookPlusStagram/app/build.gradle b/app/MyHyvesBookPlusStagram/app/build.gradle
index 85f6d09..83344be 100644
--- a/app/MyHyvesBookPlusStagram/app/build.gradle
+++ b/app/MyHyvesBookPlusStagram/app/build.gradle
@@ -6,7 +6,7 @@ android {
     defaultConfig {
         applicationId "nl.myhyvesbookplus.tagram"
         minSdkVersion 21
-        targetSdkVersion 25
+        targetSdkVersion 21
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimeLineAdapter.java b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimeLineAdapter.java
index c5fde32..6f05305 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimeLineAdapter.java
+++ b/app/MyHyvesBookPlusStagram/app/src/main/java/nl/myhyvesbookplus/tagram/TimeLineAdapter.java
@@ -101,4 +101,5 @@ public class TimeLineAdapter extends BaseAdapter implements AdapterView.OnItemCl
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         Log.d(TAG, "onItemClick: rowNumber! "+ position);
     }
+
 }
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..5bb29b8 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/values-nl/strings.xml
@@ -30,6 +30,5 @@
     <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="niet_slecht">\"Niet slecht.\"s</string>
 </resources>
\ No newline at end of file
diff --git a/app/MyHyvesBookPlusStagram/app/src/main/res/values/colors.xml b/app/MyHyvesBookPlusStagram/app/src/main/res/values/colors.xml
index 9709ac7..c2c4abc 100644
--- a/app/MyHyvesBookPlusStagram/app/src/main/res/values/colors.xml
+++ b/app/MyHyvesBookPlusStagram/app/src/main/res/values/colors.xml
@@ -2,6 +2,6 @@
 <resources>
     <color name="colorPrimary">#fbbf2d</color>
     <color name="colorPrimaryDark">#ffa70f</color>
-    <color name="colorAccent">#4bAfe5</color>
-    <!--<color name="colorAccent">#4CAF50</color>-->
+    <!--<color name="colorAccent">#4bAfe5</color>-->
+    <color name="colorAccent">#4CAF50</color>
 </resources>

From 0b943e3a1ad8ac318c2f4ea47851c5c8cbe6e138 Mon Sep 17 00:00:00 2001
From: Marijn Jansen <therijn@users.noreply.github.com>
Date: Tue, 27 Jun 2017 11:17:31 +0200
Subject: [PATCH 2/2] Fixed a crash when switching fast to profile after
 loading the app.

---
 .../nl/myhyvesbookplus/tagram/MainActivity.java    | 14 +++++---------
 1 file changed, 5 insertions(+), 9 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..b10ecbd 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
@@ -1,5 +1,6 @@
 package nl.myhyvesbookplus.tagram;
 
+import android.app.Fragment;
 import android.app.FragmentManager;
 import android.app.FragmentTransaction;
 import android.content.Intent;
@@ -15,7 +16,6 @@ import android.view.View;
 import com.google.firebase.auth.FirebaseAuth;
 
 import nl.myhyvesbookplus.tagram.controller.DownloadClass;
-import nl.myhyvesbookplus.tagram.controller.PostUploader;
 import nl.myhyvesbookplus.tagram.controller.ProfilePictureUploader;
 
 public class MainActivity extends AppCompatActivity implements
@@ -104,11 +104,6 @@ public class MainActivity extends AppCompatActivity implements
         this.finish();
     }
 
-//    public void testCreatePost(View view) {
-//        DownloadClass downloadClass = new DownloadClass();
-//        downloadClass.getPosts();
-//    }
-
     @Override
     public void ProfilePictureUpdated(Boolean success) {
         Log.d(TAG, "ProfilePictureUpdated: Ja ik luister naar je!");
@@ -125,9 +120,10 @@ public class MainActivity extends AppCompatActivity implements
     @Override
     public void PostDownloaded() {
         FragmentManager fragmentManager = getFragmentManager();
-        fragmentManager.findFragmentById(R.id.content);
-        TimelineFragment frag = (TimelineFragment) fragmentManager.findFragmentById(R.id.content);
-        frag.startList();
+        Fragment frag = fragmentManager.findFragmentById(R.id.content);
 
+        if (frag instanceof TimelineFragment) {
+            ((TimelineFragment) frag).startList();
+        }
     }
 }