| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * This file is part of Adblock Plus <https://adblockplus.org/>, | 2  * This file is part of Adblock Plus <https://adblockplus.org/>, | 
| 3  * Copyright (C) 2006-2015 Eyeo GmbH | 3  * Copyright (C) 2006-2015 Eyeo GmbH | 
| 4  * | 4  * | 
| 5  * Adblock Plus is free software: you can redistribute it and/or modify | 5  * Adblock Plus is free software: you can redistribute it and/or modify | 
| 6  * it under the terms of the GNU General Public License version 3 as | 6  * it under the terms of the GNU General Public License version 3 as | 
| 7  * published by the Free Software Foundation. | 7  * published by the Free Software Foundation. | 
| 8  * | 8  * | 
| 9  * Adblock Plus is distributed in the hope that it will be useful, | 9  * Adblock Plus is distributed in the hope that it will be useful, | 
| 10  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10  * but WITHOUT ANY WARRANTY; without even the implied warranty of | 
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 67     if (generateReport) | 67     if (generateReport) | 
| 68       writeToFile(e, REPORT_FILE); | 68       writeToFile(e, REPORT_FILE); | 
| 69 | 69 | 
| 70     if (restoreProxy) | 70     if (restoreProxy) | 
| 71       clearProxySettings(); | 71       clearProxySettings(); | 
| 72 | 72 | 
| 73     if (notificationManager != null) | 73     if (notificationManager != null) | 
| 74     { | 74     { | 
| 75       try | 75       try | 
| 76       { | 76       { | 
| 77         notificationManager.cancel(ProxyService.ONGOING_NOTIFICATION_ID); | 77         notificationManager.cancel(AdblockPlus.ONGOING_NOTIFICATION_ID); | 
| 78       } | 78       } | 
| 79       catch (final Throwable ex) | 79       catch (final Throwable ex) | 
| 80       { | 80       { | 
| 81         ex.printStackTrace(); | 81         ex.printStackTrace(); | 
| 82       } | 82       } | 
| 83     } | 83     } | 
| 84     notificationManager = null; | 84     notificationManager = null; | 
| 85 | 85 | 
| 86     defaultUEH.uncaughtException(t, e); | 86     defaultUEH.uncaughtException(t, e); | 
| 87   } | 87   } | 
| (...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 183       } | 183       } | 
| 184     } | 184     } | 
| 185     catch (final Throwable t) | 185     catch (final Throwable t) | 
| 186     { | 186     { | 
| 187       // This method here must not throw any exceptions to make sure it does not
      kill anything else. | 187       // This method here must not throw any exceptions to make sure it does not
      kill anything else. | 
| 188       // And it's safe to ignore this exception here, because if resetting the p
     roxy fails, then it fails ... and we don't get a second chance to | 188       // And it's safe to ignore this exception here, because if resetting the p
     roxy fails, then it fails ... and we don't get a second chance to | 
| 189       // clear it again (because we're most likely currently crashing). | 189       // clear it again (because we're most likely currently crashing). | 
| 190     } | 190     } | 
| 191   } | 191   } | 
| 192 } | 192 } | 
| OLD | NEW | 
|---|