Unified Diff: libadblockplus-android/src/org/adblockplus/libadblockplus/android/AdblockEngine.java
Issue 29399749:
Issue 5081 - Make libadblockplus-android users supply the application and applicationVersion parame… (Closed)
Patch Set: minor reformatting
Created March 31, 2017, 1:43 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockHelper.java ('K')
|
« libadblockplus-android/src/org/adblockplus/libadblockplus/AppInfo.java ('k')
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: libadblockplus-android/src/org/adblockplus/libadblockplus/android/AdblockEngine.java |
| diff --git a/libadblockplus-android/src/org/adblockplus/libadblockplus/android/AdblockEngine.java b/libadblockplus-android/src/org/adblockplus/libadblockplus/android/AdblockEngine.java |
| index 3cabbbbb58d298a782cc47809d45970b6cce7d26..9f4e981b89aa4eb788acaff233f9f14abffbcba9 100644 |
| --- a/libadblockplus-android/src/org/adblockplus/libadblockplus/android/AdblockEngine.java |
| +++ b/libadblockplus-android/src/org/adblockplus/libadblockplus/android/AdblockEngine.java |
| @@ -79,29 +79,35 @@ public final class AdblockEngine |
| private volatile boolean enabled = true; |
| private volatile List<String> whitelistedDomains; |
| - public static AppInfo generateAppInfo(final Context context, boolean developmentBuild) |
| + public static AppInfo generateAppInfo(final Context context, boolean developmentBuild, |
| + String application, String applicationVersion) |
| { |
| - String version = "0"; |
| - try |
| - { |
| - final PackageInfo info = context.getPackageManager().getPackageInfo(context.getPackageName(), 0); |
| - version = info.versionName; |
| - if (developmentBuild) |
| - version += "." + info.versionCode; |
| - } |
| - catch (final NameNotFoundException e) |
| - { |
| - Log.e(TAG, "Failed to get the application version number", e); |
| - } |
| final String sdkVersion = String.valueOf(VERSION.SDK_INT); |
| final String locale = Locale.getDefault().toString().replace('_', '-'); |
| - return AppInfo.builder() |
| - .setVersion(version) |
| + AppInfo.Builder builder = |
| + AppInfo |
| + .builder() |
| .setApplicationVersion(sdkVersion) |
| .setLocale(locale) |
| - .setDevelopmentBuild(developmentBuild) |
| - .build(); |
| + .setDevelopmentBuild(developmentBuild); |
| + |
| + if (application != null) |
| + { |
| + builder.setApplication(application); |
| + } |
| + |
| + if (applicationVersion != null) |
| + { |
| + builder.setApplicationVersion(applicationVersion); |
| + } |
| + |
| + return builder.build(); |
| + } |
| + |
| + public static AppInfo generateAppInfo(final Context context, boolean developmentBuild) |
| + { |
| + return generateAppInfo(context, developmentBuild, null, null); |
| } |
| /** |
« libadblockplus-android-settings/src/org/adblockplus/libadblockplus/android/settings/AdblockHelper.java ('K')
|
« libadblockplus-android/src/org/adblockplus/libadblockplus/AppInfo.java ('k')
|
no next file »
|
no next file with comments »
