Switch back to using BuildConfig fields

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
index 514e59a..85de4b4 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/ContextMenuActivity.java
@@ -45,6 +45,7 @@ import android.view.Gravity;
 import android.view.View;
 import android.view.WindowManager;
 
+import com.farmerbb.taskbar.BuildConfig;
 import com.farmerbb.taskbar.MainActivity;
 import com.farmerbb.taskbar.R;
 import com.farmerbb.taskbar.activity.dark.SelectAppActivityDark;
@@ -282,7 +283,7 @@ public class ContextMenuActivity extends PreferenceActivity implements Preferenc
             homeIntent.addCategory(Intent.CATEGORY_HOME);
             ResolveInfo defaultLauncher = pm.resolveActivity(homeIntent, PackageManager.MATCH_DEFAULT_ONLY);
 
-            if(!packageName.contains(U.BASE_APPLICATION_ID)
+            if(!packageName.contains(BuildConfig.BASE_APPLICATION_ID)
                     && !packageName.equals(defaultLauncher.activityInfo.packageName)) {
                 PinnedBlockedApps pba = PinnedBlockedApps.getInstance(this);
 

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/ImportSettingsActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/ImportSettingsActivity.java
index fda4235..d6af50b 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/ImportSettingsActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/ImportSettingsActivity.java
@@ -23,6 +23,7 @@ import android.content.IntentFilter;
 import android.os.Bundle;
 import android.support.v4.content.LocalBroadcastManager;
 
+import com.farmerbb.taskbar.BuildConfig;
 import com.farmerbb.taskbar.MainActivity;
 import com.farmerbb.taskbar.R;
 import com.farmerbb.taskbar.util.U;
@@ -53,7 +54,7 @@ public class ImportSettingsActivity extends Activity {
 
         if(!broadcastSent) {
             Intent intent = new Intent("com.farmerbb.taskbar.RECEIVE_SETTINGS");
-            intent.setPackage(U.BASE_APPLICATION_ID);
+            intent.setPackage(BuildConfig.BASE_APPLICATION_ID);
             sendBroadcast(intent);
 
             broadcastSent = true;

diff --git a/app/src/main/java/com/farmerbb/taskbar/receiver/ReceiveSettingsReceiver.java b/app/src/main/java/com/farmerbb/taskbar/receiver/ReceiveSettingsReceiver.java
index 46e907a..a341d0c 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/receiver/ReceiveSettingsReceiver.java
+++ b/app/src/main/java/com/farmerbb/taskbar/receiver/ReceiveSettingsReceiver.java
@@ -25,6 +25,7 @@ import android.os.Process;
 import android.os.UserManager;
 import android.support.v4.content.LocalBroadcastManager;
 
+import com.farmerbb.taskbar.BuildConfig;
 import com.farmerbb.taskbar.util.AppEntry;
 import com.farmerbb.taskbar.util.Blacklist;
 import com.farmerbb.taskbar.util.BlacklistEntry;
@@ -32,7 +33,6 @@ import com.farmerbb.taskbar.util.IconCache;
 import com.farmerbb.taskbar.util.PinnedBlockedApps;
 import com.farmerbb.taskbar.util.SavedWindowSizes;
 import com.farmerbb.taskbar.util.TopApps;
-import com.farmerbb.taskbar.util.U;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -42,7 +42,7 @@ public class ReceiveSettingsReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
         // Ignore this broadcast if this is the free version
-        if(context.getPackageName().equals(U.PAID_APPLICATION_ID)) {
+        if(BuildConfig.APPLICATION_ID.equals(BuildConfig.PAID_APPLICATION_ID)) {
             // Get pinned and blocked apps
             PinnedBlockedApps pba = PinnedBlockedApps.getInstance(context);
             pba.clear(context);

diff --git a/app/src/main/java/com/farmerbb/taskbar/receiver/SendSettingsReceiver.java b/app/src/main/java/com/farmerbb/taskbar/receiver/SendSettingsReceiver.java
index 6cd324e..4397949 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/receiver/SendSettingsReceiver.java
+++ b/app/src/main/java/com/farmerbb/taskbar/receiver/SendSettingsReceiver.java
@@ -20,6 +20,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 
+import com.farmerbb.taskbar.BuildConfig;
 import com.farmerbb.taskbar.util.AppEntry;
 import com.farmerbb.taskbar.util.Blacklist;
 import com.farmerbb.taskbar.util.BlacklistEntry;
@@ -40,9 +41,9 @@ public class SendSettingsReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
         // Ignore this broadcast if this is the paid version
-        if(context.getPackageName().equals(U.BASE_APPLICATION_ID)) {
+        if(BuildConfig.APPLICATION_ID.equals(BuildConfig.BASE_APPLICATION_ID)) {
             Intent sendSettingsIntent = new Intent("com.farmerbb.taskbar.SEND_SETTINGS");
-            sendSettingsIntent.setPackage(U.PAID_APPLICATION_ID);
+            sendSettingsIntent.setPackage(BuildConfig.PAID_APPLICATION_ID);
 
             // Get pinned and blocked apps
             PinnedBlockedApps pba = PinnedBlockedApps.getInstance(context);

diff --git a/app/src/main/java/com/farmerbb/taskbar/service/TaskbarService.java b/app/src/main/java/com/farmerbb/taskbar/service/TaskbarService.java
index b05b44a..0858e5d 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/service/TaskbarService.java
+++ b/app/src/main/java/com/farmerbb/taskbar/service/TaskbarService.java
@@ -74,6 +74,7 @@ import android.support.v4.content.LocalBroadcastManager;
 import android.widget.LinearLayout;
 import android.widget.Space;
 
+import com.farmerbb.taskbar.BuildConfig;
 import com.farmerbb.taskbar.MainActivity;
 import com.farmerbb.taskbar.R;
 import com.farmerbb.taskbar.activity.ContextMenuActivity;
@@ -646,7 +647,7 @@ public class TaskbarService extends Service {
                 // Also filter out the current launcher, and Taskbar itself
                 for(AppEntry packageInfo : usageStatsList) {
                     if(hasLauncherIntent(packageInfo.getPackageName())
-                            && !packageInfo.getPackageName().contains(U.BASE_APPLICATION_ID)
+                            && !packageInfo.getPackageName().contains(BuildConfig.BASE_APPLICATION_ID)
                             && !packageInfo.getPackageName().equals(defaultLauncher.activityInfo.packageName))
                         usageStatsList2.add(packageInfo);
                 }
@@ -686,7 +687,7 @@ public class TaskbarService extends Service {
                         events.getNextEvent(eventCache);
 
                         if(eventCache.getEventType() == UsageEvents.Event.MOVE_TO_FOREGROUND) {
-                            if(!(eventCache.getPackageName().contains(U.BASE_APPLICATION_ID)
+                            if(!(eventCache.getPackageName().contains(BuildConfig.BASE_APPLICATION_ID)
                                     && !eventCache.getClassName().equals(MainActivity.class.getCanonicalName())
                                     && !eventCache.getClassName().equals(HomeActivity.class.getCanonicalName())
                                     && !eventCache.getClassName().equals(InvisibleActivityFreeform.class.getCanonicalName())))

diff --git a/app/src/main/java/com/farmerbb/taskbar/util/U.java b/app/src/main/java/com/farmerbb/taskbar/util/U.java
index 36674b8..0f33074 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/util/U.java
+++ b/app/src/main/java/com/farmerbb/taskbar/util/U.java
@@ -74,9 +74,6 @@ public class U {
 
     private U() {}
 
-    public static final String BASE_APPLICATION_ID = BuildConfig.BASE_APPLICATION_ID;
-    public static final String PAID_APPLICATION_ID = BuildConfig.PAID_APPLICATION_ID;
-
     private static SharedPreferences pref;
     private static Integer cachedRotation;