diff --git a/app/src/main/java/org/indywidualni/fblite/activity/MainActivity.java b/app/src/main/java/org/indywidualni/fblite/activity/MainActivity.java index 02ba922..f25068b 100644 --- a/app/src/main/java/org/indywidualni/fblite/activity/MainActivity.java +++ b/app/src/main/java/org/indywidualni/fblite/activity/MainActivity.java @@ -757,6 +757,8 @@ public void onRefresh() { if (!Connectivity.isConnected(getApplicationContext()) && !preferences.getBoolean("offline_mode", false)) Toast.makeText(getApplicationContext(), getString(R.string.no_network), Toast.LENGTH_SHORT).show(); + webView.stopLoading(); + // reloading page (if offline try to load a live version first) if (preferences.getBoolean("offline_mode", false) && MyWebViewClient.wasOffline) webView.loadUrl(MyWebViewClient.currentlyLoadedPage); @@ -1129,4 +1131,8 @@ public static Activity getMainActivity() { return mainActivity; } + public SwipeRefreshLayout getSwipeRefreshLayout() { + return swipeRefreshLayout; + } + } diff --git a/app/src/main/java/org/indywidualni/fblite/webview/MyWebViewClient.java b/app/src/main/java/org/indywidualni/fblite/webview/MyWebViewClient.java index cc65464..eaf9469 100644 --- a/app/src/main/java/org/indywidualni/fblite/webview/MyWebViewClient.java +++ b/app/src/main/java/org/indywidualni/fblite/webview/MyWebViewClient.java @@ -131,6 +131,11 @@ public void onReceivedError(WebView view, WebResourceRequest req, WebResourceErr @Override public void onPageFinished(WebView view, String url) { + if (url.contains("messenger.com")) + ((MainActivity) MainActivity.getMainActivity()).getSwipeRefreshLayout().setEnabled(false); + else + ((MainActivity) MainActivity.getMainActivity()).getSwipeRefreshLayout().setEnabled(true); + // when Zero is activated and there is a mobile network connection ignore extra customizations if (!preferences.getBoolean("facebook_zero", false) || !Connectivity.isConnectedMobile(context)) {