Skip to content

Commit 6ed548a

Browse files
committed
fix receiver crashes
1 parent fea914e commit 6ed548a

1 file changed

Lines changed: 20 additions & 4 deletions

File tree

app/src/main/java/eu/faircode/netguard/ActivityMain.java

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -541,11 +541,27 @@ public void onDestroy() {
541541
running = false;
542542
adapter = null;
543543

544-
PreferenceManager.getDefaultSharedPreferences(this).unregisterOnSharedPreferenceChangeListener(this);
544+
try {
545+
PreferenceManager.getDefaultSharedPreferences(this).unregisterOnSharedPreferenceChangeListener(this);
546+
} catch (Throwable ex) {
547+
Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
548+
}
545549

546-
LocalBroadcastManager.getInstance(this).unregisterReceiver(onRulesChanged);
547-
LocalBroadcastManager.getInstance(this).unregisterReceiver(onQueueChanged);
548-
unregisterReceiver(packageChangedReceiver);
550+
try {
551+
LocalBroadcastManager.getInstance(this).unregisterReceiver(onRulesChanged);
552+
} catch (Throwable ex) {
553+
Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
554+
}
555+
try {
556+
LocalBroadcastManager.getInstance(this).unregisterReceiver(onQueueChanged);
557+
} catch (Throwable ex) {
558+
Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
559+
}
560+
try {
561+
unregisterReceiver(packageChangedReceiver);
562+
} catch (Throwable ex) {
563+
Log.e(TAG, ex.toString() + "\n" + Log.getStackTraceString(ex));
564+
}
549565

550566
if (dialogVpn != null) {
551567
dialogVpn.dismiss();

0 commit comments

Comments
 (0)