From 6eb6b3cabe7ce8d3681bd1511c44f929093723f4 Mon Sep 17 00:00:00 2001
From: serso <se.solovyev@gmail.com>
Date: Thu, 14 Jan 2016 16:20:44 +0100
Subject: [PATCH] Report error only where it is appropriate

---
 .../calculator/CalculatorDialogActivity.java  |  1 -
 .../calculator/CalculatorEngineImpl.java      | 24 +++++--------------
 .../android/calculator/CalculatorImpl.java    |  3 ++-
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/org/solovyev/android/calculator/CalculatorDialogActivity.java b/app/src/main/java/org/solovyev/android/calculator/CalculatorDialogActivity.java
index 632a0bb5..61b375a0 100644
--- a/app/src/main/java/org/solovyev/android/calculator/CalculatorDialogActivity.java
+++ b/app/src/main/java/org/solovyev/android/calculator/CalculatorDialogActivity.java
@@ -91,7 +91,6 @@ public class CalculatorDialogActivity extends ActionBarActivity {
 
         final DialogData dialogData = readDialogData(getIntent());
         if (dialogData == null) {
-            Locator.getInstance().getErrorReporter().onError("Dialog data is null!");
             this.finish();
         } else {
             setContentView(R.layout.cpp_dialog);
diff --git a/app/src/main/java/org/solovyev/android/calculator/CalculatorEngineImpl.java b/app/src/main/java/org/solovyev/android/calculator/CalculatorEngineImpl.java
index 232961ee..af349c17 100644
--- a/app/src/main/java/org/solovyev/android/calculator/CalculatorEngineImpl.java
+++ b/app/src/main/java/org/solovyev/android/calculator/CalculatorEngineImpl.java
@@ -22,6 +22,11 @@
 
 package org.solovyev.android.calculator;
 
+import java.text.DecimalFormatSymbols;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
 import jscl.AngleUnit;
 import jscl.JsclMathEngine;
 import jscl.MathEngine;
@@ -32,10 +37,6 @@ import jscl.math.function.IConstant;
 import jscl.math.operator.Operator;
 import jscl.text.ParseException;
 
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-import java.text.DecimalFormatSymbols;
-
 public class CalculatorEngineImpl implements CalculatorEngine {
 
 	/*
@@ -180,28 +181,15 @@ public class CalculatorEngineImpl implements CalculatorEngine {
         try {
             registry.load();
         } catch (Exception e) {
-            logException(e);
+            Locator.getInstance().getErrorReporter().onException(e);
         }
     }
 
-    private void logException(@Nonnull Exception e) {
-        final ErrorReporter errorReporter = Locator.getInstance().getErrorReporter();
-        errorReporter.onException(e);
-    }
-
     @Override
     public void softReset() {
         Locator.getInstance().getCalculator().fireCalculatorEvent(CalculatorEventType.engine_preferences_changed, null);
     }
 
-	/*
-	**********************************************************************
-	*
-	*                           PREFERENCES
-	*
-	**********************************************************************
-	*/
-
     @Nonnull
     @Override
     public String getMultiplicationSign() {
diff --git a/app/src/main/java/org/solovyev/android/calculator/CalculatorImpl.java b/app/src/main/java/org/solovyev/android/calculator/CalculatorImpl.java
index 198cbcc9..7017c0f9 100644
--- a/app/src/main/java/org/solovyev/android/calculator/CalculatorImpl.java
+++ b/app/src/main/java/org/solovyev/android/calculator/CalculatorImpl.java
@@ -23,6 +23,7 @@
 package org.solovyev.android.calculator;
 
 import android.text.TextUtils;
+import android.util.Log;
 
 import com.squareup.otto.Bus;
 import com.squareup.otto.Subscribe;
@@ -279,7 +280,7 @@ public class CalculatorImpl implements Calculator, CalculatorEventListener {
                             }
                         } catch (Throwable e) {
                             // todo serso: not good but we need proper synchronization
-                            errorReporter.onException(e);
+                            Log.e("Calculator", e.getMessage(), e);
                         }
                     }