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

uniq broadcast receiver

This commit is contained in:
stom79 2018-01-02 10:58:29 +01:00
parent 6a0956bfee
commit c70f670b89
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
View File

@ -134,7 +134,7 @@ public abstract class BaseMainActivity extends BaseActivity
private DisplayStatusFragment homeFragment, federatedFragment, localFragment;
private DisplayNotificationsFragment notificationsFragment;
private static final int ERROR_DIALOG_REQUEST_CODE = 97;
private BroadcastReceiver receive_data, receive_federated_data, receive_local_data;
private static BroadcastReceiver receive_data, receive_federated_data, receive_local_data;
private boolean display_local, display_global;
public static int countNewStatus = 0;
public static int countNewNotifications = 0;
@ -828,6 +828,8 @@ public abstract class BaseMainActivity extends BaseActivity
}
Helper.switchLayout(BaseMainActivity.this);
if( receive_data != null)
LocalBroadcastManager.getInstance(this).unregisterReceiver(receive_data);
receive_data = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
@ -1192,6 +1194,8 @@ public abstract class BaseMainActivity extends BaseActivity
@Override
public void onStart(){
super.onStart();
if( receive_federated_data != null)
LocalBroadcastManager.getInstance(this).unregisterReceiver(receive_federated_data);
receive_federated_data = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {
@ -1206,6 +1210,8 @@ public abstract class BaseMainActivity extends BaseActivity
}
}
};
if( receive_local_data != null)
LocalBroadcastManager.getInstance(this).unregisterReceiver(receive_local_data);
receive_local_data = new BroadcastReceiver() {
@Override
public void onReceive(Context context, Intent intent) {

4
app/src/main/java/fr/gouv/etalab/mastodon/client/HttpsConnection.java
View File

@ -427,9 +427,7 @@ public class HttpsConnection {
return httpsURLConnection.getInputStream();
}
httpsURLConnection.disconnect();
} catch (IOException | NoSuchAlgorithmException | KeyManagementException e) {
e.printStackTrace();
}
} catch (IOException | NoSuchAlgorithmException | KeyManagementException ignored) {}
if(httpsURLConnection != null)
httpsURLConnection.disconnect();
return null;

5
app/src/main/java/fr/gouv/etalab/mastodon/services/LiveNotificationService.java
View File

@ -211,15 +211,14 @@ public class LiveNotificationService extends BaseService {
try {
JSONObject eventJson = new JSONObject(event);
onRetrieveStreaming(eventStreaming, account, eventJson);
} catch (JSONException ignored) {ignored.printStackTrace();}
} catch (JSONException ignored) {}
}
}
}else {
httpsURLConnection.disconnect();
}
} catch (Exception ignored) { ignored.printStackTrace();
}finally {
} catch (Exception ignored) {}finally {
if (reader != null) {
try {
reader.close();