Merge pull request #14 from jwark/do_not_copy_to_clipboard

Android: Do not copy the scanned barcode to the clipboard.
phonegap · Apr 11, 2013 · 15b5cb9 · 15b5cb9
2 parents 3c73e21 + 1d8ee5c
commit 15b5cb9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/src/android/LibraryProject/res/xml/preferences.xml b/src/android/LibraryProject/res/xml/preferences.xml
@@ -40,7 +40,7 @@
         android:title="@string/preferences_vibrate_title"/>
     <CheckBoxPreference
         android:key="preferences_copy_to_clipboard"
-        android:defaultValue="true"
+        android:defaultValue="false"
         android:title="@string/preferences_copy_to_clipboard_title"/>
     <CheckBoxPreference
         android:key="preferences_remember_duplicates"

diff --git a/src/android/LibraryProject/src/com/google/zxing/client/android/CaptureActivity.java b/src/android/LibraryProject/src/com/google/zxing/client/android/CaptureActivity.java
@@ -238,7 +238,7 @@ protected void onResume() {
     }
 
     SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
-    copyToClipboard = prefs.getBoolean(PreferencesActivity.KEY_COPY_TO_CLIPBOARD, true)
+    copyToClipboard = prefs.getBoolean(PreferencesActivity.KEY_COPY_TO_CLIPBOARD, false)
         && (intent == null || intent.getBooleanExtra(Intents.Scan.SAVE_HISTORY, true));
 
     beepManager.updatePrefs();

diff --git a/src/android/com.google.zxing.client.android.captureactivity.jar b/src/android/com.google.zxing.client.android.captureactivity.jar