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

Side by Side Diff: src/org/adblockplus/android/Preferences.java

Issue 5153282527854592: Issue 98 - Use the libadblockplus update mechanism (Closed)
Patch Set: Created Sept. 25, 2014, 3:57 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
OLDNEW
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 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
277 final Uri uri = Uri.parse(getString(R.string.configuring_url)); 277 final Uri uri = Uri.parse(getString(R.string.configuring_url));
278 final Intent intent = new Intent(Intent.ACTION_VIEW, uri); 278 final Intent intent = new Intent(Intent.ACTION_VIEW, uri);
279 startActivity(intent); 279 startActivity(intent);
280 return true; 280 return true;
281 case R.id.menu_about: 281 case R.id.menu_about:
282 showDialog(ABOUT_DIALOG); 282 showDialog(ABOUT_DIALOG);
283 return true; 283 return true;
284 case R.id.menu_advanced: 284 case R.id.menu_advanced:
285 startActivity(new Intent(this, AdvancedPreferences.class)); 285 startActivity(new Intent(this, AdvancedPreferences.class));
286 return true; 286 return true;
287 case R.id.menu_update:
288 AdblockPlus.getApplication().checkUpdates();
289 return true;
287 default: 290 default:
288 return super.onOptionsItemSelected(item); 291 return super.onOptionsItemSelected(item);
289 } 292 }
290 } 293 }
291 294
292 private void setAcceptableAdsEnabled(final boolean enabled) 295 private void setAcceptableAdsEnabled(final boolean enabled)
293 { 296 {
294 final CheckBoxPreference acceptableAdsPreference = 297 final CheckBoxPreference acceptableAdsPreference =
295 (CheckBoxPreference) findPreference(getString(R.string.pref_acceptablead s)); 298 (CheckBoxPreference) findPreference(getString(R.string.pref_acceptablead s));
296 acceptableAdsPreference.setChecked(enabled); 299 acceptableAdsPreference.setChecked(enabled);
(...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 subscriptionSummary = state.getString("subscriptionSummary"); 570 subscriptionSummary = state.getString("subscriptionSummary");
568 } 571 }
569 572
570 @Override 573 @Override
571 protected void onSaveInstanceState(final Bundle outState) 574 protected void onSaveInstanceState(final Bundle outState)
572 { 575 {
573 outState.putString("subscriptionSummary", subscriptionSummary); 576 outState.putString("subscriptionSummary", subscriptionSummary);
574 super.onSaveInstanceState(outState); 577 super.onSaveInstanceState(outState);
575 } 578 }
576 } 579 }
OLDNEW

Powered by Google App Engine
This is Rietveld