From df125aadd7f538bd4f841296bc95ca5da1b5b554 Mon Sep 17 00:00:00 2001 From: peli0101 Date: Sat, 30 May 2009 13:28:04 +0000 Subject: [PATCH] OI Safe: Turn off debug messages and mark version 1.1.1. git-svn-id: http://openintents.googlecode.com/svn/trunk/Safe@2115 72b678ce-9140-0410-bee8-679b907dd61a --- AndroidManifest.xml | 5 +++-- readme.txt | 5 +++-- src/org/openintents/safe/CryptoContentProvider.java | 10 +++++----- src/org/openintents/safe/CryptoHelper.java | 10 +++++----- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 9e89ac3..17d7b90 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,9 @@ - diff --git a/readme.txt b/readme.txt index 8da2698..2fc8067 100644 --- a/readme.txt +++ b/readme.txt @@ -26,10 +26,11 @@ To obtain the current release, visit --------------------------------------------------------- release: 1.1.1 -date: 2009-?? +date: 2009-05-30 - Secure deletion of CSV files after import. -- Add support for file encryption. +- Add support for file stream encryption, + to be used by Obscura. - Add Trivium stream cipher. --------------------------------------------------------- diff --git a/src/org/openintents/safe/CryptoContentProvider.java b/src/org/openintents/safe/CryptoContentProvider.java index 6c17a46..6ad3bd4 100644 --- a/src/org/openintents/safe/CryptoContentProvider.java +++ b/src/org/openintents/safe/CryptoContentProvider.java @@ -32,7 +32,7 @@ import android.util.Log; public class CryptoContentProvider extends ContentProvider { - private static final boolean debug = true; + private static final boolean debug = false; private static final String TAG = "CryptoContentProvider"; public static final String AUTHORITY = "org.openintents.safe"; @@ -148,7 +148,7 @@ public class CryptoContentProvider extends ContentProvider { return null; } - Log.d(TAG, "Original file path: " + originalFile); + if (debug) Log.d(TAG, "Original file path: " + originalFile); if (CategoryList.isSignedIn()==false) { Intent frontdoor = new Intent(getContext(), FrontDoor.class); frontdoor.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); @@ -159,12 +159,12 @@ public class CryptoContentProvider extends ContentProvider { if (ch == null) { throw new CryptoHelperException("CryptoHelper not available. Are you logged in?"); } - Log.d(TAG, "Decrypt.."); + if (debug) Log.d(TAG, "Decrypt.."); Uri newuri = ch.decryptFileWithSessionKeyThroughContentProvider(this.getContext(), Uri.parse(originalFile)); cryptSession = newuri.getPathSegments().get(1); sessionFile=SESSION_FILE+"."+cryptSession; path += "/"+sessionFile; - Log.d(TAG, "New path: " + path); + if (debug) Log.d(TAG, "New path: " + path); break; default: throw new IllegalArgumentException("Unknown URI " + uri); @@ -180,7 +180,7 @@ public class CryptoContentProvider extends ContentProvider { // disappears. This makes for a one time use // content provider. if (!getContext().deleteFile(sessionFile)) { - Log.e(TAG,"openFile: unable to delete: "+sessionFile); + if (debug) Log.e(TAG,"openFile: unable to delete: "+sessionFile); } } catch (FileNotFoundException e) { if (debug) Log.d(TAG,"openFile: FileNotFound"); diff --git a/src/org/openintents/safe/CryptoHelper.java b/src/org/openintents/safe/CryptoHelper.java index aae1131..0094031 100644 --- a/src/org/openintents/safe/CryptoHelper.java +++ b/src/org/openintents/safe/CryptoHelper.java @@ -66,7 +66,7 @@ import estreamj.framework.ESJException; */ public class CryptoHelper { - private static final boolean debug = true; + private static final boolean debug = false; private static String TAG = "CryptoHelper"; public static final String OISAFE_EXTENSION = ".oisafe"; @@ -432,7 +432,7 @@ public class CryptoHelper { * @throws Exception */ public String encryptWithSessionKey(String plaintext) throws CryptoHelperException { - Log.i(TAG, "Encrypt with session key"); + if (debug) Log.i(TAG, "Encrypt with session key"); status=false; // assume failure if(password == null) { String msg = "Must call setPassword before runing encrypt."; @@ -498,7 +498,7 @@ public class CryptoHelper { String stringCipherVersion = "A"; String stringCipherSessionKey = toHexString(cipherSessionKey); String stringCiphertext=toHexString(ciphertext); - Log.i(TAG, "Length: " + stringCipherSessionKey.length() + ", " + stringCipherSessionKey); + if (debug) Log.i(TAG, "Length: " + stringCipherSessionKey.length() + ", " + stringCipherSessionKey); StringBuilder sb = new StringBuilder(stringCipherVersion.length() + stringCipherSessionKey.length() @@ -759,7 +759,7 @@ public class CryptoHelper { * @throws Exception */ public Uri decryptFileWithSessionKey(Context ctx, Uri fileUri) throws CryptoHelperException { - Log.d(TAG, "fileUri="+fileUri.toString()); + if (debug) Log.d(TAG, "fileUri="+fileUri.toString()); ContentResolver contentResolver = ctx.getContentResolver(); String inputPath = null; @@ -837,7 +837,7 @@ public class CryptoHelper { * @throws Exception */ public Uri decryptFileWithSessionKeyThroughContentProvider(Context ctx, Uri fileUri) throws CryptoHelperException { - Log.d(TAG, "fileUri="+fileUri.toString()); + if (debug) Log.d(TAG, "fileUri="+fileUri.toString()); ContentResolver contentResolver = ctx.getContentResolver(); String sessionFile = ""; -- 2.50.1