Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'bug_fixes' into develop

This commit is contained in:
tom79 2019-12-22 18:45:53 +01:00
parent d22eda3cb2 6547a2a015
commit 7ac320094e
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/app/fedilab/android/services/LiveNotificationDelayedService.java
View File

@ -89,10 +89,7 @@ public class LiveNotificationDelayedService extends Service {
super.onCreate();
final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
boolean notify = sharedpreferences.getBoolean(Helper.SET_NOTIFY, true);
if( !notify ){
stopSelf();
return;
}
if (Build.VERSION.SDK_INT >= 26) {
channel = new NotificationChannel(CHANNEL_ID,
"Live notifications",
@ -100,6 +97,7 @@ public class LiveNotificationDelayedService extends Service {
((NotificationManager) Objects.requireNonNull(getSystemService(Context.NOTIFICATION_SERVICE))).createNotificationChannel(channel);
}
SQLiteDatabase db = Sqlite.getInstance(getApplicationContext(), Sqlite.DB_NAME, null, Sqlite.DB_VERSION).open();
List<Account> accountStreams = new AccountDAO(getApplicationContext(), db).getAllAccountCrossAction();
totalAccount = 0;
@ -128,6 +126,10 @@ public class LiveNotificationDelayedService extends Service {
.setContentText(getString(R.string.top_notification_message, String.valueOf(totalAccount), String.valueOf(eventsCount))).build();
startForeground(1, notification);
if( !notify ){
stopSelf();
return;
}
if (totalAccount > 0) {
startStream();
} else {

8
app/src/main/java/app/fedilab/android/services/LiveNotificationService.java
View File

@ -105,10 +105,6 @@ public class LiveNotificationService extends Service implements NetworkStateRece
super.onCreate();
final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
boolean notify = sharedpreferences.getBoolean(Helper.SET_NOTIFY, true);
if( !notify ){
stopSelf();
return;
}
networkStateReceiver = new NetworkStateReceiver();
networkStateReceiver.addListener(this);
registerReceiver(networkStateReceiver, new IntentFilter(android.net.ConnectivityManager.CONNECTIVITY_ACTION));
@ -147,6 +143,10 @@ public class LiveNotificationService extends Service implements NetworkStateRece
.setContentText(getString(R.string.top_notification_message, String.valueOf(totalAccount), String.valueOf(eventsCount))).build();
startForeground(1, notification);
if( !notify ){
stopSelf();
return;
}
if (totalAccount == 0) {
stopSelf();
}