REMOVED: bugsense.

tinfoilhat · Jan 8, 2014 · f324e97 · f324e97
1 parent c518a69
commit f324e97
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 46 deletions.
diff --git a/.classpath b/.classpath
@@ -3,7 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry exported="true" kind="lib" path="libs/orwell-1.0-min.jar"/>
-	<classpathentry exported="true" kind="lib" path="libs/bugsense-3.5.jar"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>

diff --git a/libs/bugsense-3.5.jar b/libs/bugsense-3.5.jar
diff --git a/res/xml/options.xml b/res/xml/options.xml
@@ -134,14 +134,6 @@
         android:title="@string/feedback_options"
         android:key="feedback_category">
 
-        <CheckBoxPreference
-            android:key="bugsense_enable"
-		    android:title="@string/pref_enable_bugsense"
-		    android:summaryOn="@string/pref_bugsense_enabled"
-		    android:summaryOff="@string/pref_bugsense_disabled"
-		    android:defaultValue="true"
-		    android:persistent="true"/>
-
           <PreferenceScreen
            	android:title="@string/source_code_title"
             android:key="source_code"

diff --git a/src/com/tinfoil/sms/TinfoilSMS.java b/src/com/tinfoil/sms/TinfoilSMS.java
@@ -19,14 +19,10 @@
 
 import java.security.Security;
 
-import android.app.Application;
-import android.preference.PreferenceManager;
-
-import com.bugsense.trace.BugSenseHandler;
-import com.tinfoil.sms.settings.QuickPrefsActivity;
-
 import org.spongycastle.jce.provider.BouncyCastleProvider;
 
+import android.app.Application;
+
 
 /**
  * The main application class which is simply used to initialize Bugsense, which is
@@ -46,10 +42,10 @@ public void onCreate()
     {
         super.onCreate();
 
-        if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean(
+        /*if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean(
         		QuickPrefsActivity.BUGSENSE_ENABLE_SETTING_KEY, true))
         {
             BugSenseHandler.initAndStartSession(this, "169095e2");
-        }
+        }*/
     }
 }
diff --git a/src/com/tinfoil/sms/crypto/Encryption.java b/src/com/tinfoil/sms/crypto/Encryption.java
@@ -33,15 +33,13 @@
 import android.util.Base64;
 import android.util.Log;
 
-import com.bugsense.trace.BugSenseHandler;
 import com.orwell.crypto.APrioriInfo;
 import com.orwell.crypto.ECEngine;
 import com.orwell.crypto.ECGKeyUtil;
 import com.orwell.crypto.ECKeyParam;
 import com.orwell.csprng.ISAACRandomGenerator;
 import com.orwell.csprng.SDFGenerator;
 import com.orwell.csprng.SDFParameters;
-
 import com.tinfoil.sms.dataStructures.Number;
 import com.tinfoil.sms.utility.SMSUtility;
 
@@ -158,11 +156,6 @@ else if (! decryptMap.containsKey(number.getId()))
 
         /* Remove the nonce counter from the message received */
         System.arraycopy(decodedMessage, COUNT_SIZE, encMessage, 0, encMessage.length);
-
-		/* Log the message data, before it's decrypted, in the event of a crash */
-        BugSenseHandler.addCrashExtraData("Original", message);
-        BugSenseHandler.addCrashExtraData("Decoded", new String(decodedMessage));
-        BugSenseHandler.addCrashExtraData("Encrypted", new String(encMessage));
 
         /* decrypt the message, increment and save the nonce counter */
         decMessage = decryptMap.get(number.getId()).processBlock(encMessage);

diff --git a/src/com/tinfoil/sms/loader/Loader.java b/src/com/tinfoil/sms/loader/Loader.java
@@ -19,7 +19,6 @@
 
 import android.content.Context;
 
-import com.bugsense.trace.BugSenseHandler;
 import com.tinfoil.sms.database.DBAccessor;
 
 public abstract class Loader implements Runnable {
@@ -57,7 +56,6 @@ public void run() {
 						wait();
 					} catch (InterruptedException e) {
 						e.printStackTrace();
-			            BugSenseHandler.sendExceptionMessage("Type", "Loader Concurrency Issue", e);
 					}
 				}
 			}

diff --git a/src/com/tinfoil/sms/messageQueue/MessageSender.java b/src/com/tinfoil/sms/messageQueue/MessageSender.java
@@ -17,15 +17,14 @@
 
 package com.tinfoil.sms.messageQueue;
 
-import com.bugsense.trace.BugSenseHandler;
-import com.tinfoil.sms.dataStructures.Entry;
-import com.tinfoil.sms.database.DBAccessor;
-import com.tinfoil.sms.utility.SMSUtility;
-
 import android.content.Context;
 import android.os.Looper;
 import android.util.Log;
 
+import com.tinfoil.sms.dataStructures.Entry;
+import com.tinfoil.sms.database.DBAccessor;
+import com.tinfoil.sms.utility.SMSUtility;
+
 public class MessageSender implements Runnable{
 
 	private boolean loopRunner = true;
@@ -88,7 +87,6 @@ else if (mes == null && !loopRunner)
 						this.wait();
 					} catch (InterruptedException e) {
 						e.printStackTrace();
-						BugSenseHandler.sendExceptionMessage("Type", "MessageSender Concurrency Issue", e);
 					}
 				}
 			}
@@ -131,7 +129,6 @@ else if (mes == null && !loopRunner)
 						this.wait();
 					} catch (InterruptedException e) {
 						e.printStackTrace();
-						BugSenseHandler.sendExceptionMessage("Type", "MessageSender Concurrency Issue", e);
 					}
 				}
 			}

diff --git a/src/com/tinfoil/sms/settings/EditNumber.java b/src/com/tinfoil/sms/settings/EditNumber.java
@@ -44,7 +44,6 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.bugsense.trace.BugSenseHandler;
 import com.tinfoil.sms.R;
 import com.tinfoil.sms.crypto.KeyExchange;
 import com.tinfoil.sms.dataStructures.Number;
@@ -394,10 +393,8 @@ public void onClick(final DialogInterface dialog, final int which) {
 	                					    f.close();
 	                					} catch (FileNotFoundException e) {
 	                						e.printStackTrace();
-	                						BugSenseHandler.sendExceptionMessage("Type", "Import Public Key Not Found Error", e);
 	                					} catch (IOException e) {
 	                						e.printStackTrace();
-	                						BugSenseHandler.sendExceptionMessage("Type", "Import Public Key Error", e);
 	                					}
 
 	                            		String keyExchangeMessage = sb.toString();

diff --git a/src/com/tinfoil/sms/settings/QuickPrefsActivity.java b/src/com/tinfoil/sms/settings/QuickPrefsActivity.java
@@ -44,7 +44,6 @@ public class QuickPrefsActivity extends PreferenceActivity {
 	public static final String VIBRATE_SETTING_KEY = "vibrate";
 	public static final String VIBRATE_LENGTH_SETTING_KEY = "vibrate_length_settings";
 	public static final String RINGTONE_SETTING_KEY = "ringtone_settings";
-	public static final String BUGSENSE_ENABLE_SETTING_KEY = "bugsense_enable";
 	public static final String SOURCE_CODE_SETTING_KEY = "source_code";
 	public static final String REVERSE_MESSAGE_ORDERING_KEY = "list_order";
 	//public static final String messageLimitKey = 

diff --git a/src/com/tinfoil/sms/settings/UserKeySettings.java b/src/com/tinfoil/sms/settings/UserKeySettings.java
@@ -39,7 +39,6 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.bugsense.trace.BugSenseHandler;
 import com.tinfoil.sms.R;
 import com.tinfoil.sms.crypto.KeyExchange;
 import com.tinfoil.sms.crypto.KeyGenerator;
@@ -253,12 +252,10 @@ public static void writeToFile(String name, String text)
 		catch (FileNotFoundException e)
 		{
 			e.printStackTrace();
-			BugSenseHandler.sendExceptionMessage("Type", "Export Public Key Not Found Error", e);
 		}
 		catch (IOException e)
 		{
 			e.printStackTrace();
-			BugSenseHandler.sendExceptionMessage("Type", "Export Public Key Error", e);
 		}
 	}
 }
diff --git a/src/com/tinfoil/sms/utility/MessageReceiver.java b/src/com/tinfoil/sms/utility/MessageReceiver.java
@@ -32,7 +32,6 @@
 import android.util.Log;
 import android.widget.Toast;
 
-import com.bugsense.trace.BugSenseHandler;
 import com.tinfoil.sms.R;
 import com.tinfoil.sms.crypto.Encryption;
 import com.tinfoil.sms.crypto.KeyExchange;
@@ -203,12 +202,10 @@ public void onReceive(Context context, Intent intent) {
 								Toast.makeText(context, R.string.key_exchange_failed_to_decrypt, Toast.LENGTH_LONG).show();
 								Toast.makeText(context, R.string.possible_man_in_the_middle_attack_warning, Toast.LENGTH_LONG).show();
 								e.printStackTrace();
-								BugSenseHandler.sendExceptionMessage("Type", "Decrypt Message Error or Man In The Middle Attack", e);
 							}
 							catch (Exception e)
 							{
 							    e.printStackTrace();
-                                BugSenseHandler.sendExceptionMessage("Type", "Message Receiver Error", e);  
 							}
 						}
 						else

diff --git a/src/com/tinfoil/sms/utility/SMSUtility.java b/src/com/tinfoil/sms/utility/SMSUtility.java
@@ -34,7 +34,6 @@
 import android.util.Log;
 import android.widget.Toast;
 
-import com.bugsense.trace.BugSenseHandler;
 import com.tinfoil.sms.R;
 import com.tinfoil.sms.crypto.Encryption;
 import com.tinfoil.sms.dataStructures.Entry;
@@ -255,14 +254,12 @@ public static boolean sendMessage(DBAccessor dba, final Context context, Entry m
         {
             Toast.makeText(context, R.string.failed_to_encrypt, Toast.LENGTH_LONG).show();
             e.printStackTrace();
-            BugSenseHandler.sendExceptionMessage("Type", "Encrypt Message Error", e);
             return false;
         }
         catch (final Exception e)
         {
             Toast.makeText(context, R.string.failed_to_sent, Toast.LENGTH_LONG).show();
             e.printStackTrace();
-            BugSenseHandler.sendExceptionMessage("Type", "Send Message Error", e);
             return false;
         }
     }