mirrors/Fedilab
1
0
Fork 1
mirror of https://codeberg.org/tom79/Fedilab.git synced 2025-06-16 10:10:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix #1120 - Display a message when clicking a link without Internet connection

Browse source
This commit is contained in:
Thomas 2025-02-20 17:29:04 +01:00
parent 97e30e00b4
commit fc24e63319
3 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/app/fedilab/android/BaseMainActivity.java
View file

@ -22,6 +22,7 @@ import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_ID;
import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_INSTANCE; import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_INSTANCE;
import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_SOFTWARE; import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_SOFTWARE;
import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_TOKEN; import static app.fedilab.android.mastodon.helper.Helper.PREF_USER_TOKEN;
import static app.fedilab.android.mastodon.helper.Helper.TAG;
import static app.fedilab.android.mastodon.helper.Helper.displayReleaseNotesIfNeeded; import static app.fedilab.android.mastodon.helper.Helper.displayReleaseNotesIfNeeded;
import static app.fedilab.android.mastodon.helper.ThemeHelper.fetchAccentColor; import static app.fedilab.android.mastodon.helper.ThemeHelper.fetchAccentColor;
import static app.fedilab.android.mastodon.ui.drawer.StatusAdapter.sendAction; import static app.fedilab.android.mastodon.ui.drawer.StatusAdapter.sendAction;
@ -1372,6 +1373,7 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
filterFetched = false; filterFetched = false;
networkStateReceiver = new NetworkStateReceiver(); networkStateReceiver = new NetworkStateReceiver();
networkStateReceiver.addListener(this); networkStateReceiver.addListener(this);
registerReceiver(networkStateReceiver, new IntentFilter(android.net.ConnectivityManager.CONNECTIVITY_ACTION));
binding = ActivityMainBinding.inflate(getLayoutInflater()); binding = ActivityMainBinding.inflate(getLayoutInflater());
setContentView(binding.getRoot()); setContentView(binding.getRoot());
setSupportActionBar(binding.toolbar); setSupportActionBar(binding.toolbar);
@ -1944,10 +1946,9 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
} }
if (networkStateReceiver != null) { if (networkStateReceiver != null) {
try { try {
networkStateReceiver.removeListener(this);
unregisterReceiver(networkStateReceiver); unregisterReceiver(networkStateReceiver);
} catch (IllegalArgumentException e) { } catch (Exception ignored) {}
e.printStackTrace();
}
} }
SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(BaseMainActivity.this); SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(BaseMainActivity.this);
boolean clearCacheExit = sharedpreferences.getBoolean(getString(R.string.SET_CLEAR_CACHE_EXIT), false); boolean clearCacheExit = sharedpreferences.getBoolean(getString(R.string.SET_CLEAR_CACHE_EXIT), false);

5
app/src/main/java/app/fedilab/android/mastodon/helper/Helper.java
View file

@ -15,6 +15,7 @@ package app.fedilab.android.mastodon.helper;
* see <http://www.gnu.org/licenses>. */ * see <http://www.gnu.org/licenses>. */
import static android.content.Context.DOWNLOAD_SERVICE; import static android.content.Context.DOWNLOAD_SERVICE;
import static app.fedilab.android.BaseMainActivity.networkAvailable;
import static app.fedilab.android.mastodon.activities.BaseActivity.currentThemeId; import static app.fedilab.android.mastodon.activities.BaseActivity.currentThemeId;
import static app.fedilab.android.mastodon.helper.LogoHelper.getNotificationIcon; import static app.fedilab.android.mastodon.helper.LogoHelper.getNotificationIcon;
import static app.fedilab.android.mastodon.helper.ThemeHelper.fetchAccentColor; import static app.fedilab.android.mastodon.helper.ThemeHelper.fetchAccentColor;
@ -684,6 +685,10 @@ public class Helper {
if (url == null) { if (url == null) {
return; return;
} }
if(networkAvailable == BaseMainActivity.status.DISCONNECTED){
Toasty.warning(context, context.getString(R.string.toast_error_internet), Toast.LENGTH_LONG).show();
return;
}
SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(context); SharedPreferences sharedpreferences = PreferenceManager.getDefaultSharedPreferences(context);
boolean customTab = sharedpreferences.getBoolean(context.getString(R.string.SET_CUSTOM_TABS), true); boolean customTab = sharedpreferences.getBoolean(context.getString(R.string.SET_CUSTOM_TABS), true);
if (customTab) { if (customTab) {

1
app/src/main/res/values/strings.xml
View file

@ -197,6 +197,7 @@
<string name="toast_bookmark">The message was added to your bookmarks!</string> <string name="toast_bookmark">The message was added to your bookmarks!</string>
<string name="toast_unbookmark">The message was removed from your bookmarks!</string> <string name="toast_unbookmark">The message was removed from your bookmarks!</string>
<string name="toast_error">Oops ! An error occurred!</string> <string name="toast_error">Oops ! An error occurred!</string>
<string name="toast_error_internet">There is no Internet connection!</string>
<string name="toast_code_error">An error occurred! The instance did not return an authorisation code!</string> <string name="toast_code_error">An error occurred! The instance did not return an authorisation code!</string>
<string name="toast_error_instance">The instance domain does not seem to be valid!</string> <string name="toast_error_instance">The instance domain does not seem to be valid!</string>
<string name="toast_error_loading_account">An error occurred while switching between accounts!</string> <string name="toast_error_loading_account">An error occurred while switching between accounts!</string>