ABP/Android Proxy switch

src/org/adblockplus/android/Starter.java

 /*
  * This file is part of the Adblock Plus,
  * Copyright (C) 2006-2012 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 17 matching lines @@
 
   @Override
   public void onReceive(Context context, Intent intent)
   {
     String action = intent.getAction();
     SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
     boolean enabled = prefs.getBoolean(context.getString(R.string.pref_enabled), false);
     boolean proxyenabled = prefs.getBoolean(context.getString(R.string.pref_proxyenabled), false);
     if (Intent.ACTION_PACKAGE_REPLACED.equals(action))
     {
-      boolean us = "org.adblockplus.android".equals(intent.getData().getSchemeSpecificPart());

[Felix Dahlke, 2013/03/11 06:57:38]

Any idea how we could not hard code the package here? I'd suggest
getClass().getPack().getName(), but it appears this has nothing to do with the
package of the class Starter here. Would
AdblockPlus.getClass().getPack().getName() make more sense?

[Andrey Novikov, 2013/03/11 07:32:55]

Done.

[Andrey Novikov, 2013/03/11 07:32:55]

Done.

+      String pkg = context.getApplicationInfo().packageName;
+      boolean us = pkg.equals(intent.getData().getSchemeSpecificPart());
       enabled &= us;
       proxyenabled &= us;
     }
     if (Intent.ACTION_BOOT_COMPLETED.equals(action))
     {
       boolean startAtBoot = prefs.getBoolean(context.getString(R.string.pref_startatboot), context.getResources().getBoolean(R.bool.def_startatboot));
       enabled &= startAtBoot;
       proxyenabled &= startAtBoot;
     }
     if (enabled)
     {
       AdblockPlus application = AdblockPlus.getApplication();
       application.setFilteringEnabled(true);
       application.startEngine();
     }
     if (proxyenabled)
       context.startService(new Intent(context, ProxyService.class));
   }
 
 }