aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-02-28 17:49:09 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-02-28 17:49:09 +0100
commit4e29d027af05fc574dc5398d2fb3afcdf3defc70 (patch)
tree8ac89962ee31ad9cc7b32523bd4e6700e388a199 /OpenKeychain/src/main
parent0557e0680e3cdedc32f8ebe35105b772c7b3935b (diff)
downloadopen-keychain-4e29d027af05fc574dc5398d2fb3afcdf3defc70.tar.gz
open-keychain-4e29d027af05fc574dc5398d2fb3afcdf3defc70.tar.bz2
open-keychain-4e29d027af05fc574dc5398d2fb3afcdf3defc70.zip
fix a couple lint errors
Diffstat (limited to 'OpenKeychain/src/main')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java2
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java7
2 files changed, 5 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java
index 94eaa8171..948da94d8 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysProxyActivity.java
@@ -149,7 +149,7 @@ public class ImportKeysProxyActivity extends FragmentActivity {
private void processScannedContent(Uri uri) {
- Log.d(Constants.TAG, "scanned: " + uri.toString());
+ Log.d(Constants.TAG, "scanned: " + uri);
String fingerprint = null;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index 3bc207419..742cde75c 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -20,6 +20,7 @@ package org.sufficientlysecure.keychain.ui;
import android.animation.ArgbEvaluator;
import android.animation.ObjectAnimator;
+import android.annotation.SuppressLint;
import android.annotation.TargetApi;
import android.app.Activity;
import android.app.ActivityOptions;
@@ -127,6 +128,7 @@ public class ViewKeyActivity extends BaseActivity implements
private String mFingerprint;
private long mMasterKeyId;
+ @SuppressLint("InflateParams")
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -210,7 +212,7 @@ public class ViewKeyActivity extends BaseActivity implements
}
}
- Log.i(Constants.TAG, "mDataUri: " + mDataUri.toString());
+ Log.i(Constants.TAG, "mDataUri: " + mDataUri);
mActionEncryptFile.setOnClickListener(new View.OnClickListener() {
@Override
@@ -624,8 +626,6 @@ public class ViewKeyActivity extends BaseActivity implements
/**
* Load QR Code asynchronously and with a fade in animation
- *
- * @param fingerprint
*/
private void loadQrCode(final String fingerprint) {
AsyncTask<Void, Void, Bitmap> loadTask =
@@ -952,6 +952,7 @@ public class ViewKeyActivity extends BaseActivity implements
mPreviousColor = color;
}
+ //noinspection deprecation
mStatusImage.setAlpha(80);
break;