moving Log back to ASK app

3 files changed, 16 insertions, 27 deletions

diff --git a/src/main/java/com/anysoftkeyboard/ui/dev/DeveloperToolsFragment.java b/src/main/java/com/anysoftkeyboard/ui/dev/DeveloperToolsFragment.java
index f425b9636..a1607e8b9 100644
--- a/src/main/java/com/anysoftkeyboard/ui/dev/DeveloperToolsFragment.java
+++ b/src/main/java/com/anysoftkeyboard/ui/dev/DeveloperToolsFragment.java
@@ -30,7 +30,7 @@ import android.widget.Button;
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.anysoftkeyboard.base.utils.Log;
+import com.anysoftkeyboard.utils.Log;
 import com.menny.android.anysoftkeyboard.R;
 
 import net.evendanan.pushingpixels.AsyncTaskWithProgressWindow;
@@ -174,13 +174,7 @@ public class DeveloperToolsFragment extends Fragment implements AsyncTaskWithPro
     private void onUserClickedShareMemoryDump(View v) {
         File memDump = (File) v.getTag();
 
-        StringBuilder sb = new StringBuilder(
-                "Hi! Here is a memory dump file for ");
-        sb.append(DeveloperUtils.getAppDetails(getActivity().getApplicationContext()));
-        sb.append(DeveloperUtils.NEW_LINE);
-        sb.append(DeveloperUtils.getSysInfo());
-
-        shareFile(memDump, "AnySoftKeyboard Memory Dump File", sb.toString());
+        shareFile(memDump, "AnySoftKeyboard Memory Dump File", "Hi! Here is a memory dump file for " + DeveloperUtils.getAppDetails(getActivity().getApplicationContext()) + DeveloperUtils.NEW_LINE + DeveloperUtils.getSysInfo(getActivity()));
     }
 
     private void onUserClickedFlipTracing() {
@@ -214,13 +208,8 @@ public class DeveloperToolsFragment extends Fragment implements AsyncTaskWithPro
     }
 
     private void onUserClickedShareTracingFile() {
-        StringBuilder sb = new StringBuilder("Hi! Here is a tracing file for ");
-        sb.append(DeveloperUtils.getAppDetails(getActivity().getApplicationContext()));
-        sb.append(DeveloperUtils.NEW_LINE);
-        sb.append(DeveloperUtils.getSysInfo());
-
         shareFile(DeveloperUtils.getTraceFile(), "AnySoftKeyboard Trace File",
-                sb.toString());
+                "Hi! Here is a tracing file for " + DeveloperUtils.getAppDetails(getActivity().getApplicationContext()) + DeveloperUtils.NEW_LINE + DeveloperUtils.getSysInfo(getActivity()));
     }
 
     private void onUserClickedShowLogCat(View v) {
@@ -228,15 +217,8 @@ public class DeveloperToolsFragment extends Fragment implements AsyncTaskWithPro
     }
 
     private void onUserClickedShareLogCat() {
-        StringBuilder sb = new StringBuilder("Hi! Here is a LogCat snippet for ");
-        sb.append(DeveloperUtils.getAppDetails(getActivity().getApplicationContext()));
-        sb.append(DeveloperUtils.NEW_LINE);
-        sb.append(DeveloperUtils.getSysInfo());
-        sb.append(DeveloperUtils.NEW_LINE);
-        sb.append(Log.getAllLogLines());
-
         shareFile(null, "AnySoftKeyboard LogCat",
-                sb.toString());
+                "Hi! Here is a LogCat snippet for " + DeveloperUtils.getAppDetails(getActivity().getApplicationContext()) + DeveloperUtils.NEW_LINE + DeveloperUtils.getSysInfo(getActivity()) + DeveloperUtils.NEW_LINE + Log.getAllLogLines());
     }
 
     private void shareFile(File fileToShare, String title, String message) {
diff --git a/src/main/java/com/anysoftkeyboard/ui/dev/DeveloperUtils.java b/src/main/java/com/anysoftkeyboard/ui/dev/DeveloperUtils.java
index 18390d4cf..cbc77775a 100644
--- a/src/main/java/com/anysoftkeyboard/ui/dev/DeveloperUtils.java
+++ b/src/main/java/com/anysoftkeyboard/ui/dev/DeveloperUtils.java
@@ -21,11 +21,13 @@ import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.content.res.Configuration;
 import android.os.Debug;
 import android.os.Environment;
 import android.preference.PreferenceManager;
+import android.support.annotation.Nullable;
 
-import com.anysoftkeyboard.base.utils.Log;
+import com.anysoftkeyboard.utils.Log;
 import com.anysoftkeyboard.utils.Workarounds;
 import com.menny.android.anysoftkeyboard.AnyApplication;
 import com.menny.android.anysoftkeyboard.R;
@@ -83,7 +85,7 @@ public class DeveloperUtils {
         return new File(extFolder, ASK_TRACE_FILENAME);
     }
 
-    public static String getSysInfo() {
+    public static String getSysInfo(@Nullable Context context) {
         StringBuilder sb = new StringBuilder();
         sb.append("BRAND:").append(android.os.Build.BRAND).append(NEW_LINE);
         sb.append("DEVICE:").append(android.os.Build.DEVICE).append(NEW_LINE);
@@ -99,6 +101,12 @@ public class DeveloperUtils {
                 .append(NEW_LINE);
         sb.append("VERSION.SDK_INT:").append(Workarounds.getApiLevel())
                 .append(NEW_LINE);
+        if (context != null && context.getResources() != null && context.getResources().getConfiguration() != null) {
+            Configuration configuration = context.getResources().getConfiguration();
+            sb.append("Locale:").append(configuration.locale).append(NEW_LINE);
+            sb.append("configuration:").append(configuration.toString()).append(NEW_LINE);
+        }
+
         sb.append("That's all I know.");
         return sb.toString();
     }
@@ -108,8 +116,7 @@ public class DeveloperUtils {
         try {
             PackageInfo info = appContext.getPackageManager().getPackageInfo(
                     appContext.getPackageName(), 0);
-            appName = appName + " v" + info.versionName + " release "
-                    + info.versionCode;
+            appName = appName + " v" + info.versionName + " release " + info.versionCode;
             appName = appName +". Installed on " + AnyApplication.getConfig().getTimeCurrentVersionInstalled()
                     + ", first release installed was "+AnyApplication.getConfig().getFirstAppVersionInstalled()+".";
         } catch (NameNotFoundException e) {
diff --git a/src/main/java/com/anysoftkeyboard/ui/dev/LogCatViewFragment.java b/src/main/java/com/anysoftkeyboard/ui/dev/LogCatViewFragment.java
index ce2aaf99e..6a981a509 100644
--- a/src/main/java/com/anysoftkeyboard/ui/dev/LogCatViewFragment.java
+++ b/src/main/java/com/anysoftkeyboard/ui/dev/LogCatViewFragment.java
@@ -24,7 +24,7 @@ import android.view.ViewGroup;
 import android.view.animation.Animation;
 import android.widget.ArrayAdapter;
 
-import com.anysoftkeyboard.base.utils.Log;
+import com.anysoftkeyboard.utils.Log;
 
 import net.evendanan.pushingpixels.PassengerFragmentSupport;
 import net.evendanan.pushingpixels.Passengerable;