fix Null-Pointer-Exception

2 files changed, 7 insertions, 6 deletions

diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PodcastFragmentActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PodcastFragmentActivity.java
index ee7026b3..a91f448f 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PodcastFragmentActivity.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PodcastFragmentActivity.java
@@ -99,17 +99,15 @@ public class PodcastFragmentActivity extends AppCompatActivity implements IPlayP
                 e.printStackTrace();
             }
         }*/
-        mMTM.bindDisplayActivity(this);
-
 
         super.onCreate(savedInstanceState);
     }
 
     @Override
-    protected void onDestroy() {
-        mMTM.unbindDisplayActivity(this);
+    protected void onStart() {
+        super.onStart();
 
-        super.onDestroy();
+        mMTM.bindDisplayActivity(this);
     }
 
     @Override
@@ -149,6 +147,8 @@ public class PodcastFragmentActivity extends AppCompatActivity implements IPlayP
 
     @Override
     protected void onStop() {
+        mMTM.unbindDisplayActivity(this);
+
         super.onStop();
 
         unbindPodcastService();
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/ssl/MemorizingTrustManager.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/ssl/MemorizingTrustManager.java
index 05ecac2f..f5b3a55d 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/ssl/MemorizingTrustManager.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/ssl/MemorizingTrustManager.java
@@ -179,8 +179,9 @@ public class MemorizingTrustManager implements X509TrustManager {
 	 */
 	public void unbindDisplayActivity(Activity act) {
 		// do not remove if it was overridden by a different activity
-		if (foregroundAct.get() == act)
+		if (foregroundAct != null && foregroundAct.get() == act) {
 			foregroundAct = null;
+		}
 	}
 
 	/**