diff options
author | David Luhmer <david-dev@live.de> | 2017-05-29 00:28:37 +0300 |
---|---|---|
committer | David Luhmer <david-dev@live.de> | 2017-05-29 00:28:37 +0300 |
commit | d3c3b709a972534797be484156778ba4eb729d96 (patch) | |
tree | b419289473e278d101ad5d448e6b0bf82b4d9134 /News-Android-App/src/main/java/de | |
parent | 58962362b75de441ba4d40b5d6f2f844ca8afb9f (diff) |
fix Null-Pointer-Exception
Diffstat (limited to 'News-Android-App/src/main/java/de')
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; + } } /** |