Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Delta Between Two Patch Sets: src/org/adblockplus/android/AdblockPlus.java

Issue 4705284891082752: Proxy configurators (Closed)
Left Patch Set: Created Aug. 11, 2014, 12:36 p.m.
Right Patch Set: Last batch of review issues Created Aug. 24, 2014, 11:52 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Left: Side by side diff | Download
Right: Side by side diff | Download
« no previous file with change/comment | « no previous file | src/org/adblockplus/android/AdvancedPreferences.java » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
1 /* 1 /*
2 * This file is part of Adblock Plus <http://adblockplus.org/>, 2 * This file is part of Adblock Plus <http://adblockplus.org/>,
3 * Copyright (C) 2006-2014 Eyeo GmbH 3 * Copyright (C) 2006-2014 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 350 matching lines...) Expand 10 before | Expand all | Expand 10 after
361 contentType = "IMAGE"; 361 contentType = "IMAGE";
362 else if (RE_FONT.matcher(url).find()) 362 else if (RE_FONT.matcher(url).find())
363 contentType = "FONT"; 363 contentType = "FONT";
364 else if (RE_HTML.matcher(url).find()) 364 else if (RE_HTML.matcher(url).find())
365 contentType = "SUBDOCUMENT"; 365 contentType = "SUBDOCUMENT";
366 } 366 }
367 if (contentType == null) 367 if (contentType == null)
368 contentType = "OTHER"; 368 contentType = "OTHER";
369 369
370 final List<String> referrerChain = referrerMapping.buildReferrerChain(referr er); 370 final List<String> referrerChain = referrerMapping.buildReferrerChain(referr er);
371 // Currently disabled, we need some more control over what we log
372 // Log.d("Referrer chain", fullUrl + ": " + referrerChain.toString());
Felix Dahlke 2014/08/19 09:06:00 Just remove it, that's fine.
René Jeschke 2014/08/19 10:41:33 Done.
373 final String[] referrerChainArray = referrerChain.toArray(new String[referre rChain.size()]); 371 final String[] referrerChainArray = referrerChain.toArray(new String[referre rChain.size()]);
374 return abpEngine.matches(fullUrl, contentType, referrerChainArray); 372 return abpEngine.matches(fullUrl, contentType, referrerChainArray);
375 } 373 }
376 374
377 /** 375 /**
378 * Checks if filtering is enabled. 376 * Checks if filtering is enabled.
379 */ 377 */
380 public boolean isFilteringEnabled() 378 public boolean isFilteringEnabled()
381 { 379 {
382 return filteringEnabled; 380 return filteringEnabled;
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 Log.e(TAG, e.getMessage(), e); 496 Log.e(TAG, e.getMessage(), e);
499 } 497 }
500 498
501 // Set crash handler 499 // Set crash handler
502 Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(this)); 500 Thread.setDefaultUncaughtExceptionHandler(new CrashHandler(this));
503 501
504 // Initiate update check 502 // Initiate update check
505 scheduleUpdater(0); 503 scheduleUpdater(0);
506 } 504 }
507 } 505 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld