From 2857de4d5a61f636efe925c7b9dc01d8d7c89537 Mon Sep 17 00:00:00 2001
From: Thialfihar <thi@thialfihar.org>
Date: Thu, 25 Jun 2015 12:35:19 +0200
Subject: Import R and BuildConfig explicitly

---
 .../src/main/java/org/sufficientlysecure/keychain/Constants.java        | 2 ++
 .../main/java/org/sufficientlysecure/keychain/KeychainApplication.java  | 1 +
 .../java/org/sufficientlysecure/keychain/WorkaroundBuildConfig.java     | 2 ++
 3 files changed, 5 insertions(+)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
index b6e6a819f..d1b37aed2 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java
@@ -23,6 +23,8 @@ import org.spongycastle.bcpg.HashAlgorithmTags;
 import org.spongycastle.bcpg.SymmetricKeyAlgorithmTags;
 import org.spongycastle.jce.provider.BouncyCastleProvider;
 
+import org.sufficientlysecure.keychain.BuildConfig;
+
 import java.io.File;
 
 public final class Constants {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
index 98f19e98f..8d43c0155 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
@@ -34,6 +34,7 @@ import android.widget.Toast;
 
 import org.spongycastle.jce.provider.BouncyCastleProvider;
 import org.sufficientlysecure.keychain.provider.TemporaryStorageProvider;
+import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.ui.ConsolidateDialogActivity;
 import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.util.PRNGFixes;
diff --git a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/WorkaroundBuildConfig.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/WorkaroundBuildConfig.java
index ab14649f8..5f1a20fe9 100644
--- a/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/WorkaroundBuildConfig.java
+++ b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/WorkaroundBuildConfig.java
@@ -1,5 +1,7 @@
 package org.sufficientlysecure.keychain;
 
+import org.sufficientlysecure.keychain.BuildConfig;
+
 /**
  * Temporary workaround for https://github.com/robolectric/robolectric/issues/1747
  */
-- 
cgit v1.2.3