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

Some improvements

This commit is contained in:
tom79 2017-08-29 20:46:48 +02:00
parent 120ce335fd
commit 0c09a86800
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/fr/gouv/etalab/mastodon/asynctasks/StreamingUserAsyncTask.java
View File

@ -106,6 +106,7 @@ public class StreamingUserAsyncTask extends AsyncTask {
reader = new BufferedReader(new InputStreamReader(inputStream));
String event;
EventStreaming eventStreaming = null;
while((event = reader.readLine()) != null){
if( lastEvent == EventStreaming.NONE || lastEvent == null) {
switch (event.trim()) {

16
app/src/main/java/fr/gouv/etalab/mastodon/services/StreamingService.java
View File

@ -262,6 +262,7 @@ public class StreamingService extends Service implements OnRetrieveStreamingInte
Account account = new AccountDAO(getApplicationContext(), db).getAccountByID(userconnected);
//User receiving the notification is connected and application is to front, notification won't be pushed
//Instead, the interaction is done in the activity
if( activityVisible && isCurrentAccountLoggedIn(acct, userId)){
notify = false;
Intent intentBC = new Intent(Helper.RECEIVE_DATA);
@ -288,24 +289,17 @@ public class StreamingService extends Service implements OnRetrieveStreamingInte
editor.apply();
}else if(event == StreamingUserAsyncTask.EventStreaming.UPDATE ){
List<Account> accounts = new AccountDAO(getApplicationContext(),db).getAllAccount();
//It means there is no user in DB.
if( accounts == null )
return;
//lastePreviousContent contains the content of the last notification, if it was a mention it will avoid to push two notifications
if( account == null || (lastePreviousContent != null && lastePreviousContent.equals(status.getContent()))) { //troubles when getting the account
notify = false;
}else if(account.getAcct().trim().equals(acct.trim()) && account.getId().trim().equals(userId.trim())){
//Same account, no notification
notify = false;
}else {
notify = true;
//Retrieve users in db that owner has, and if the toot matches one of them we don't notify
for (Account act_tmp: accounts) {
String acct_from = status.getAccount().getAcct().trim();
String userid_from = status.getAccount().getId().trim();
if( isCurrentAccountLoggedIn(acct_from, userid_from)) {
List<Account> accounts = new AccountDAO(getApplicationContext(),db).getAllAccount();
for(Account act_tmp: accounts) {
if(act_tmp.getAcct().trim().equals(status.getAccount().getAcct()) && act_tmp.getId().trim().equals(status.getAccount().getId().trim())){
notify = false;
break;
}

1
app/src/safetynet/java/fr.gouv.etalab.mastodon/activities/MainActivity.java
View File

@ -148,7 +148,6 @@ public class MainActivity extends AppCompatActivity
public void onReceive(Context context, Intent intent) {
Bundle b = intent.getExtras();
StreamingUserAsyncTask.EventStreaming eventStreaming = (StreamingUserAsyncTask.EventStreaming) intent.getSerializableExtra("eventStreaming");
if( eventStreaming == StreamingUserAsyncTask.EventStreaming.NOTIFICATION){
Notification notification = b.getParcelable("data");
if(notificationsFragment != null){