diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-06-26 15:15:38 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-06-26 15:15:38 +0200 |
| commit | 080d1c747acd32311b8582ae33ad5972148a6e49 (patch) | |
| tree | 98dd2fbb98ee47da1ea8ec7bec1369d2c2ec9194 /OpenKeychain | |
| parent | 51d35c7a834bce7c49e74ded61b9434ffd94a911 (diff) | |
| parent | e8c10b9b5d115782e84e47526029a6cd1e5951f5 (diff) | |
| download | open-keychain-080d1c747acd32311b8582ae33ad5972148a6e49.tar.gz open-keychain-080d1c747acd32311b8582ae33ad5972148a6e49.tar.bz2 open-keychain-080d1c747acd32311b8582ae33ad5972148a6e49.zip | |
Merge pull request #1373 from thialfihar/feature/add-debug-app-name
Add debug app name
Diffstat (limited to 'OpenKeychain')
4 files changed, 9 insertions, 0 deletions
diff --git a/OpenKeychain/src/debug/res/values/strings.xml b/OpenKeychain/src/debug/res/values/strings.xml new file mode 100644 index 000000000..d954e05bb --- /dev/null +++ b/OpenKeychain/src/debug/res/values/strings.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="app_name">"OpenKeychain (Debug)"</string> +</resources> 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 */ |