mirror of
https://github.com/moparisthebest/open-keychain
synced 2024-12-17 21:02:17 -05:00
Prefix local vars with "_"
This commit is contained in:
parent
a29dfc0add
commit
9e089f03b6
@ -50,9 +50,9 @@ public class ApgService extends Service {
|
||||
}
|
||||
|
||||
if (!pArgs.isEmpty()) {
|
||||
Iterator<String> iter = pArgs.keySet().iterator();
|
||||
while (iter.hasNext()) {
|
||||
warnings.add("Unknown key: " + iter.next());
|
||||
Iterator<String> _iter = pArgs.keySet().iterator();
|
||||
while (_iter.hasNext()) {
|
||||
warnings.add("Unknown key: " + _iter.next());
|
||||
}
|
||||
}
|
||||
|
||||
@ -61,24 +61,24 @@ public class ApgService extends Service {
|
||||
return false;
|
||||
}
|
||||
|
||||
Preferences mPreferences = Preferences.getPreferences(getBaseContext(), true);
|
||||
InputStream inStream = new ByteArrayInputStream(msg.getBytes());
|
||||
InputData in = new InputData(inStream, 9999);
|
||||
OutputStream out = new ByteArrayOutputStream();
|
||||
long enc_keys[] = {};
|
||||
Preferences _mPreferences = Preferences.getPreferences(getBaseContext(), true);
|
||||
InputStream _inStream = new ByteArrayInputStream(msg.getBytes());
|
||||
InputData _in = new InputData(_inStream, 9999);
|
||||
OutputStream _out = new ByteArrayOutputStream();
|
||||
long _enc_keys[] = {};
|
||||
|
||||
Apg.initialize(getApplicationContext());
|
||||
try {
|
||||
Apg.encrypt(getApplicationContext(), // context
|
||||
in, // input stream
|
||||
out, // output stream
|
||||
_in, // input stream
|
||||
_out, // output stream
|
||||
true, // armored
|
||||
enc_keys, // encryption keys
|
||||
_enc_keys, // encryption keys
|
||||
0, // signature key
|
||||
null, // signature passphrase
|
||||
null, // progress
|
||||
mPreferences.getDefaultEncryptionAlgorithm(), // encryption
|
||||
mPreferences.getDefaultHashAlgorithm(), // hash
|
||||
_mPreferences.getDefaultEncryptionAlgorithm(), // encryption
|
||||
_mPreferences.getDefaultHashAlgorithm(), // hash
|
||||
Id.choice.compression.none, // compression
|
||||
false, // mPreferences.getForceV3Signatures(),
|
||||
passphrase // passPhrase
|
||||
@ -92,7 +92,7 @@ public class ApgService extends Service {
|
||||
}
|
||||
|
||||
Log.d(TAG, "Encrypted");
|
||||
pReturn.putString("RESULT", out.toString());
|
||||
pReturn.putString("RESULT", _out.toString());
|
||||
return true;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user