From 9e089f03b6efb656650be7fa465833f189398af5 Mon Sep 17 00:00:00 2001 From: Markus Doits Date: Sun, 9 Jan 2011 19:16:22 +0000 Subject: Prefix local vars with "_" --- src/org/thialfihar/android/apg/ApgService.java | 30 +++++++++++++------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/org') diff --git a/src/org/thialfihar/android/apg/ApgService.java b/src/org/thialfihar/android/apg/ApgService.java index 316e9a22c..ec744448b 100644 --- a/src/org/thialfihar/android/apg/ApgService.java +++ b/src/org/thialfihar/android/apg/ApgService.java @@ -50,9 +50,9 @@ public class ApgService extends Service { } if (!pArgs.isEmpty()) { - Iterator iter = pArgs.keySet().iterator(); - while (iter.hasNext()) { - warnings.add("Unknown key: " + iter.next()); + Iterator _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; } @@ -105,7 +105,7 @@ public class ApgService extends Service { String encrypted_msg = pArgs.getString("MSG"); pArgs.remove("MSG"); - + String passphrase = pArgs.getString("SYM_KEY"); pArgs.remove("SYM_KEY"); -- cgit v1.2.3