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

ImportKeys: Fix warnings

Browse Source
This commit is contained in:
Andrea Torlaschi
2016-08-24 12:45:23 +02:00
parent ab3aaf3cb4
commit 28f2659cc2
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
View File

@@ -80,7 +80,7 @@ public class ImportKeysActivity extends BaseActivity implements ImportKeysListen
public static final String TAG_FRAG_TOP = "frag_top"; public static final String TAG_FRAG_TOP = "frag_top";
private boolean mFreshIntent; private boolean mFreshIntent;
private CryptoOperationHelper<ImportKeyringParcel, ImportKeyResult> mOperationHelper; private CryptoOperationHelper<ImportKeyringParcel, ImportKeyResult> mOpHelper;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@@ -308,8 +308,8 @@ public class ImportKeysActivity extends BaseActivity implements ImportKeysListen
@Override @Override
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (mOperationHelper != null && if (mOpHelper != null &&
mOperationHelper.handleActivityResult(requestCode, resultCode, data)) { mOpHelper.handleActivityResult(requestCode, resultCode, data)) {
return; return;
} }
super.onActivityResult(requestCode, resultCode, data); super.onActivityResult(requestCode, resultCode, data);
@@ -355,8 +355,8 @@ public class ImportKeysActivity extends BaseActivity implements ImportKeysListen
ImportKeyringParcel inputParcel = new ImportKeyringParcel(null, null); ImportKeyringParcel inputParcel = new ImportKeyringParcel(null, null);
ImportKeysOperationCallback callback = new ImportKeysOperationCallback(this, inputParcel); ImportKeysOperationCallback callback = new ImportKeysOperationCallback(this, inputParcel);
mOperationHelper = new CryptoOperationHelper(1, this, callback, R.string.progress_importing); mOpHelper = new CryptoOperationHelper<>(1, this, callback, R.string.progress_importing);
mOperationHelper.cryptoOperation(); mOpHelper.cryptoOperation();
} }
@Override @Override

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

@@ -156,7 +156,7 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
b.extra.showKey.setOnClickListener(new OnClickListener() { b.extra.showKey.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View v) {
Intent intent = new Intent(mActivity, ViewKeyActivity.class); Intent intent = new Intent(mActivity, ViewKeyActivity.class);
intent.setData(KeyRings.buildGenericKeyRingUri(entry.getKeyId())); intent.setData(KeyRings.buildGenericKeyRingUri(entry.getKeyId()));
mActivity.startActivity(intent); mActivity.startActivity(intent);
@@ -176,7 +176,7 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
ImportKeysResultListener listener = skipSave ? this : mListener; ImportKeysResultListener listener = skipSave ? this : mListener;
ImportKeysOperationCallback cb = new ImportKeysOperationCallback(listener, inputParcel); ImportKeysOperationCallback cb = new ImportKeysOperationCallback(listener, inputParcel);
int message = skipSave ? R.string.progress_downloading : R.string.progress_importing; int message = skipSave ? R.string.progress_downloading : R.string.progress_importing;
CryptoOperationHelper opHelper = new CryptoOperationHelper(1, mActivity, cb, message); CryptoOperationHelper opHelper = new CryptoOperationHelper<>(1, mActivity, cb, message);
opHelper.cryptoOperation(); opHelper.cryptoOperation();
} }

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

@@ -11,9 +11,7 @@ import android.widget.Toast;
import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.R;
/**
* Created by Andrea on 19/06/2016.
*/
public class PermissionsUtil { public class PermissionsUtil {
private static final int PERMISSION_READ_EXTERNAL_STORAGE = 1; private static final int PERMISSION_READ_EXTERNAL_STORAGE = 1;