cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2275 from open-keychain/debug

Browse Source 
Use Constants.DEBUG instead of BuildConfig.DEBUG
This commit is contained in:
Vincent Breitmoser
2018-03-05 23:15:09 +01:00
committed by GitHub
parent 55519c3744 6541cc57b5
commit 7337293ad8
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java
View File

@@ -178,7 +178,7 @@ public class KeychainApplication extends Application {
private void updateLoggingStatus() { private void updateLoggingStatus() {
Timber.uprootAll(); Timber.uprootAll();
boolean enableDebugLogging = BuildConfig.DEBUG; boolean enableDebugLogging = Constants.DEBUG;
if (enableDebugLogging) { if (enableDebugLogging) {
Timber.plant(new DebugTree()); Timber.plant(new DebugTree());
} }

10
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenInfo.java
View File

@@ -33,7 +33,7 @@ import android.support.annotation.Nullable;
import com.google.auto.value.AutoValue; import com.google.auto.value.AutoValue;
import org.bouncycastle.util.encoders.Hex; import org.bouncycastle.util.encoders.Hex;
import org.sufficientlysecure.keychain.BuildConfig; import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils; import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
@@ -76,7 +76,7 @@ public abstract class SecurityTokenInfo implements Parcelable {
} }
public static SecurityTokenInfo newInstanceDebugKeyserver() { public static SecurityTokenInfo newInstanceDebugKeyserver() {
if (!BuildConfig.DEBUG) { if (!Constants.DEBUG) {
throw new UnsupportedOperationException("This operation is only available in debug builds!"); throw new UnsupportedOperationException("This operation is only available in debug builds!");
} }
return SecurityTokenInfo.create(TransportType.NFC, TokenType.UNKNOWN, return SecurityTokenInfo.create(TransportType.NFC, TokenType.UNKNOWN,
@@ -85,7 +85,7 @@ public abstract class SecurityTokenInfo implements Parcelable {
} }
public static SecurityTokenInfo newInstanceDebugUri() { public static SecurityTokenInfo newInstanceDebugUri() {
if (!BuildConfig.DEBUG) { if (!Constants.DEBUG) {
throw new UnsupportedOperationException("This operation is only available in debug builds!"); throw new UnsupportedOperationException("This operation is only available in debug builds!");
} }
return SecurityTokenInfo.create(TransportType.NFC, TokenType.UNKNOWN, return SecurityTokenInfo.create(TransportType.NFC, TokenType.UNKNOWN,
@@ -94,7 +94,7 @@ public abstract class SecurityTokenInfo implements Parcelable {
} }
public static SecurityTokenInfo newInstanceDebugLocked() { public static SecurityTokenInfo newInstanceDebugLocked() {
if (!BuildConfig.DEBUG) { if (!Constants.DEBUG) {
throw new UnsupportedOperationException("This operation is only available in debug builds!"); throw new UnsupportedOperationException("This operation is only available in debug builds!");
} }
return SecurityTokenInfo.create(TransportType.NFC, TokenType.UNKNOWN, return SecurityTokenInfo.create(TransportType.NFC, TokenType.UNKNOWN,
@@ -103,7 +103,7 @@ public abstract class SecurityTokenInfo implements Parcelable {
} }
public static SecurityTokenInfo newInstanceDebugLockedHard() { public static SecurityTokenInfo newInstanceDebugLockedHard() {
if (!BuildConfig.DEBUG) { if (!Constants.DEBUG) {
throw new UnsupportedOperationException("This operation is only available in debug builds!"); throw new UnsupportedOperationException("This operation is only available in debug builds!");
} }
return SecurityTokenInfo.create(TransportType.NFC, TokenType.UNKNOWN, return SecurityTokenInfo.create(TransportType.NFC, TokenType.UNKNOWN,

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenWaitFragment.java
View File

@@ -33,7 +33,7 @@ import android.view.View.OnClickListener;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.animation.Animation; import android.view.animation.Animation;
import org.sufficientlysecure.keychain.BuildConfig; import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.securitytoken.SecurityTokenInfo; import org.sufficientlysecure.keychain.securitytoken.SecurityTokenInfo;
import org.sufficientlysecure.keychain.ui.CreateKeyActivity.FragAction; import org.sufficientlysecure.keychain.ui.CreateKeyActivity.FragAction;
@@ -57,7 +57,7 @@ public class CreateSecurityTokenWaitFragment extends Fragment {
((BaseSecurityTokenActivity) this.getActivity()).checkDeviceConnection(); ((BaseSecurityTokenActivity) this.getActivity()).checkDeviceConnection();
} }
setHasOptionsMenu(BuildConfig.DEBUG); setHasOptionsMenu(Constants.DEBUG);
} }
@Override @Override