diff options
Diffstat (limited to 'app/src/main/java/de')
6 files changed, 63 insertions, 31 deletions
diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java index cf7de1709..811628ebf 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/AboutActivity.java @@ -4,29 +4,43 @@ import android.os.Bundle; import android.support.v7.app.ActionBarActivity; import android.webkit.WebView; import android.webkit.WebViewClient; +import android.widget.LinearLayout; + import de.danoeh.antennapod.R; -/** Displays the 'about' screen */ +/** + * Displays the 'about' screen + */ public class AboutActivity extends ActionBarActivity { - private WebView webview; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - getSupportActionBar().hide(); - setContentView(R.layout.about); - webview = (WebView) findViewById(R.id.webvAbout); - webview.setWebViewClient(new WebViewClient() { - - @Override - public boolean shouldOverrideUrlLoading(WebView view, String url) { - view.loadUrl(url); - return false; - } - - }); - webview.loadUrl("file:///android_asset/about.html"); - } + private WebView webview; + private LinearLayout webviewContainer; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + getSupportActionBar().hide(); + setContentView(R.layout.about); + webviewContainer = (LinearLayout) findViewById(R.id.webvContainer); + webview = (WebView) findViewById(R.id.webvAbout); + webview.setWebViewClient(new WebViewClient() { + + @Override + public boolean shouldOverrideUrlLoading(WebView view, String url) { + view.loadUrl(url); + return false; + } + + }); + webview.loadUrl("file:///android_asset/about.html"); + } + @Override + protected void onDestroy() { + super.onDestroy(); + if (webviewContainer != null && webview != null) { + webviewContainer.removeAllViews(); + webview.destroy(); + } + } } diff --git a/app/src/main/java/de/danoeh/antennapod/activity/DefaultOnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/DefaultOnlineFeedViewActivity.java index d265c05b1..8401b41a7 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/DefaultOnlineFeedViewActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/DefaultOnlineFeedViewActivity.java @@ -123,7 +123,7 @@ public class DefaultOnlineFeedViewActivity extends OnlineFeedViewActivity { subscribeButton = (Button) header.findViewById(R.id.butSubscribe); - if (feed.getImage() != null && StringUtils.isNoneBlank(feed.getImage().getDownload_url())) { + if (feed.getImage() != null && StringUtils.isNotBlank(feed.getImage().getDownload_url())) { Picasso.with(this) .load(feed.getImage().getDownload_url()) .fit() diff --git a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java index d625f21da..727b25296 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/VideoplayerActivity.java @@ -54,6 +54,7 @@ public class VideoplayerActivity extends MediaplayerActivity { @Override protected void onCreate(Bundle savedInstanceState) { getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); + getWindow().addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN); supportRequestWindowFeature(WindowCompat.FEATURE_ACTION_BAR_OVERLAY); // has to be called before setting layout content super.onCreate(savedInstanceState); getSupportActionBar().setBackgroundDrawable(new ColorDrawable(0x80000000)); @@ -116,6 +117,13 @@ public class VideoplayerActivity extends MediaplayerActivity { videoview.getHolder().addCallback(surfaceHolderCallback); videoview.setOnTouchListener(onVideoviewTouched); + if (Build.VERSION.SDK_INT >= 16) { + videoview.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION); + } + if (Build.VERSION.SDK_INT >= 14) { + videoOverlay.setFitsSystemWindows(true); + } + setupVideoControlsToggler(); getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN); @@ -333,10 +341,10 @@ public class VideoplayerActivity extends MediaplayerActivity { butPlay.startAnimation(animation); } if (Build.VERSION.SDK_INT >= 14) { - videoview.setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE); - getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_FULLSCREEN - | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION); - + int videoviewFlag = (Build.VERSION.SDK_INT >= 16) ? View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION : 0; + getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LOW_PROFILE | View.SYSTEM_UI_FLAG_FULLSCREEN + | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | videoviewFlag); + videoOverlay.setFitsSystemWindows(true); } videoOverlay.setVisibility(View.GONE); butPlay.setVisibility(View.GONE); diff --git a/app/src/main/java/de/danoeh/antennapod/config/ClientConfigurator.java b/app/src/main/java/de/danoeh/antennapod/config/ClientConfigurator.java index de2cb5ffb..8941a5d71 100644 --- a/app/src/main/java/de/danoeh/antennapod/config/ClientConfigurator.java +++ b/app/src/main/java/de/danoeh/antennapod/config/ClientConfigurator.java @@ -8,7 +8,7 @@ import de.danoeh.antennapod.core.ClientConfig; public class ClientConfigurator { static { - ClientConfig.USER_AGENT = "AntennaPod/0.9.9.5"; + ClientConfig.USER_AGENT = "AntennaPod/0.9.9.6"; ClientConfig.applicationCallbacks = new ApplicationCallbacksImpl(); ClientConfig.downloadServiceCallbacks = new DownloadServiceCallbacksImpl(); ClientConfig.gpodnetCallbacks = new GpodnetCallbacksImpl(); diff --git a/app/src/main/java/de/danoeh/antennapod/dialog/FeedItemDialog.java b/app/src/main/java/de/danoeh/antennapod/dialog/FeedItemDialog.java index 613cd1fec..eeed10b98 100644 --- a/app/src/main/java/de/danoeh/antennapod/dialog/FeedItemDialog.java +++ b/app/src/main/java/de/danoeh/antennapod/dialog/FeedItemDialog.java @@ -16,6 +16,7 @@ import android.util.Log; import android.util.TypedValue; import android.view.MenuItem; import android.view.View; +import android.view.ViewGroup; import android.view.Window; import android.webkit.WebSettings; import android.webkit.WebView; @@ -54,6 +55,7 @@ public class FeedItemDialog extends Dialog { private FeedItem item; private QueueAccess queue; + private ViewGroup contentContainer; private View header; private TextView txtvTitle; private WebView webvDescription; @@ -107,6 +109,7 @@ public class FeedItemDialog extends Dialog { requestWindowFeature(Window.FEATURE_NO_TITLE); setContentView(R.layout.feeditem_dialog); + contentContainer = (ViewGroup) findViewById(R.id.contentContainer); txtvTitle = (TextView) findViewById(R.id.txtvTitle); header = findViewById(R.id.header); webvDescription = (WebView) findViewById(R.id.webview); @@ -225,6 +228,14 @@ public class FeedItemDialog extends Dialog { updateMenuAppearance(); } + @Override + public void dismiss() { + super.dismiss(); + if (contentContainer != null && webvDescription != null) { + contentContainer.removeAllViews(); + webvDescription.destroy(); + } + } private final FeedItemMenuHandler.MenuInterface popupMenuInterface = new FeedItemMenuHandler.MenuInterface() { @Override diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java index 4a5c3f718..c0222de8e 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemDescriptionFragment.java @@ -162,11 +162,6 @@ public class ItemDescriptionFragment extends Fragment { } @Override - public void onDestroyView() { - super.onDestroyView(); - } - - @Override public void onAttach(Activity activity) { super.onAttach(activity); if (BuildConfig.DEBUG) @@ -191,6 +186,10 @@ public class ItemDescriptionFragment extends Fragment { if (webViewLoader != null) { webViewLoader.cancel(true); } + if (webvDescription != null) { + webvDescription.removeAllViews(); + webvDescription.destroy(); + } } @SuppressLint("NewApi") |