Merge branch 'connyduck-log-improvement'

app/proguard-rules.pro

@@ -46,6 +46,7 @@
 
 # remove all logging from production apk
 -assumenosideeffects class android.util.Log {
+    public static *** getStackTraceString(...);
     public static *** d(...);
     public static *** w(...);
     public static *** v(...);

app/src/main/java/com/keylesspalace/tusky/AccountActivity.java

@@ -37,6 +37,7 @@ import android.support.v4.view.ViewCompat;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.ActionBar;
 import android.support.v7.widget.Toolbar;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -51,7 +52,6 @@ import com.keylesspalace.tusky.interfaces.StatusRemoveListener;
 import com.keylesspalace.tusky.pager.AccountPagerAdapter;
 import com.keylesspalace.tusky.util.LinkHelper;
 import com.keylesspalace.tusky.util.Assert;
-import com.keylesspalace.tusky.util.Log;
 import com.keylesspalace.tusky.util.TimelineReceiver;
 import com.keylesspalace.tusky.util.ThemeUtils;
 import com.pkmmte.view.CircularImageView;

app/src/main/java/com/keylesspalace/tusky/BaseActivity.java

@@ -26,6 +26,7 @@ import android.preference.PreferenceManager;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.text.Spanned;
+import android.util.Log;
 import android.util.TypedValue;
 import android.view.Menu;
 
@@ -36,8 +37,7 @@ import com.keylesspalace.tusky.json.SpannedTypeAdapter;
 import com.keylesspalace.tusky.json.StringWithEmoji;
 import com.keylesspalace.tusky.json.StringWithEmojiTypeAdapter;
 import com.keylesspalace.tusky.network.MastodonAPI;
-import com.keylesspalace.tusky.network.TuskyApi;
-import com.keylesspalace.tusky.util.Log;
+import com.keylesspalace.tusky.network.TuskyAPI;
 import com.keylesspalace.tusky.util.OkHttpUtils;
 import com.keylesspalace.tusky.util.PushNotificationClient;
 

app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java

@@ -58,6 +58,7 @@ import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.TextWatcher;
 import android.text.style.URLSpan;
+import android.util.Log;
 import android.view.MenuItem;
 import android.view.View;
 import android.webkit.MimeTypeMap;
@@ -76,7 +77,6 @@ import com.keylesspalace.tusky.util.DownsizeImageTask;
 import com.keylesspalace.tusky.util.EditTextTyped;
 import com.keylesspalace.tusky.util.CountUpDownLatch;
 import com.keylesspalace.tusky.util.IOUtils;
-import com.keylesspalace.tusky.util.Log;
 import com.keylesspalace.tusky.util.SpanUtils;
 import com.keylesspalace.tusky.util.ThemeUtils;
 
@@ -679,6 +679,7 @@ public class  ComposeActivity extends BaseActivity implements ComposeOptionsFrag
         try {
             descriptor = getContentResolver().openAssetFileDescriptor(uri, "r");
         } catch (FileNotFoundException e) {
+            Log.d(TAG, Log.getStackTraceString(e));
             // Eat this exception, having the descriptor be null is sufficient.
         }
         if (descriptor != null) {
@@ -1039,6 +1040,7 @@ public class  ComposeActivity extends BaseActivity implements ComposeOptionsFrag
             }
             buffer.flush();
         } catch (IOException e) {
+            Log.d(TAG, Log.getStackTraceString(e));
             return null;
         }
         return buffer.toByteArray();
@@ -1064,6 +1066,7 @@ public class  ComposeActivity extends BaseActivity implements ComposeOptionsFrag
             try {
                 stream = getContentResolver().openInputStream(item.uri);
             } catch (FileNotFoundException e) {
+                Log.d(TAG, Log.getStackTraceString(e));
                 return;
             }
 

app/src/main/java/com/keylesspalace/tusky/EditProfileActivity.java

@@ -33,6 +33,7 @@ import android.support.v4.content.ContextCompat;
 import android.support.v7.app.ActionBar;
 import android.support.v7.widget.Toolbar;
 import android.util.Base64;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -44,7 +45,6 @@ import android.widget.ProgressBar;
 import com.keylesspalace.tusky.entity.Account;
 import com.keylesspalace.tusky.entity.Profile;
 import com.keylesspalace.tusky.util.IOUtils;
-import com.keylesspalace.tusky.util.Log;
 import com.pkmmte.view.CircularImageView;
 import com.squareup.picasso.Picasso;
 import com.theartofdev.edmodo.cropper.CropImage;
@@ -486,12 +486,14 @@ public class EditProfileActivity extends BaseActivity {
                 try {
                     inputStream = contentResolver.openInputStream(uri);
                 } catch (FileNotFoundException e) {
+                    Log.d(TAG, Log.getStackTraceString(e));
                     return false;
                 }
                 Bitmap sourceBitmap;
                 try {
                     sourceBitmap = BitmapFactory.decodeStream(inputStream, null, null);
                 } catch (OutOfMemoryError error) {
+                    Log.d(TAG, Log.getStackTraceString(error));
                     return false;
                 } finally {
                     IOUtils.closeQuietly(inputStream);

app/src/main/java/com/keylesspalace/tusky/LoginActivity.java

@@ -29,6 +29,7 @@ import android.support.customtabs.CustomTabsIntent;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
 import android.text.method.LinkMovementMethod;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
@@ -39,7 +40,6 @@ import com.keylesspalace.tusky.entity.AccessToken;
 import com.keylesspalace.tusky.entity.AppCredentials;
 import com.keylesspalace.tusky.network.MastodonAPI;
 import com.keylesspalace.tusky.util.CustomTabsHelper;
-import com.keylesspalace.tusky.util.Log;
 import com.keylesspalace.tusky.util.OkHttpUtils;
 
 import java.util.HashMap;
@@ -201,7 +201,7 @@ public class LoginActivity extends AppCompatActivity {
                 @Override
                 public void onFailure(Call<AppCredentials> call, Throwable t) {
                     editText.setError(getString(R.string.error_failed_app_registration));
-                    t.printStackTrace();
+                    Log.e(TAG, Log.getStackTraceString(t));
                 }
             };
 

app/src/main/java/com/keylesspalace/tusky/MainActivity.java

@@ -36,6 +36,7 @@ import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.style.StyleSpan;
+import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -47,7 +48,6 @@ import com.keylesspalace.tusky.entity.Account;
 import com.keylesspalace.tusky.fragment.SFragment;
 import com.keylesspalace.tusky.interfaces.StatusRemoveListener;
 import com.keylesspalace.tusky.pager.TimelinePagerAdapter;
-import com.keylesspalace.tusky.util.Log;
 import com.keylesspalace.tusky.util.ThemeUtils;
 import com.mikepenz.google_material_typeface_library.GoogleMaterial;
 import com.mikepenz.materialdrawer.AccountHeader;

app/src/main/java/com/keylesspalace/tusky/ReportActivity.java

@@ -25,6 +25,7 @@ import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
+import android.util.Log;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -33,7 +34,6 @@ import android.widget.EditText;
 import com.keylesspalace.tusky.adapter.ReportAdapter;
 import com.keylesspalace.tusky.entity.Status;
 import com.keylesspalace.tusky.util.HtmlUtils;
-import com.keylesspalace.tusky.util.Log;
 import com.keylesspalace.tusky.util.ThemeUtils;
 
 import java.util.ArrayList;

app/src/main/java/com/keylesspalace/tusky/fragment/AccountListFragment.java

@@ -25,6 +25,7 @@ import android.support.design.widget.TabLayout;
 import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -43,7 +44,6 @@ import com.keylesspalace.tusky.interfaces.AccountActionListener;
 import com.keylesspalace.tusky.network.MastodonAPI;
 import com.keylesspalace.tusky.R;
 import com.keylesspalace.tusky.util.EndlessOnScrollListener;
-import com.keylesspalace.tusky.util.Log;
 import com.keylesspalace.tusky.util.ThemeUtils;
 
 import java.util.List;

app/src/main/java/com/keylesspalace/tusky/fragment/NotificationsFragment.java

@@ -27,6 +27,7 @@ import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -40,7 +41,6 @@ import com.keylesspalace.tusky.entity.Status;
 import com.keylesspalace.tusky.interfaces.StatusActionListener;
 import com.keylesspalace.tusky.interfaces.StatusRemoveListener;
 import com.keylesspalace.tusky.util.EndlessOnScrollListener;
-import com.keylesspalace.tusky.util.Log;
 import com.keylesspalace.tusky.util.ThemeUtils;
 
 import java.util.List;

app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java

@@ -28,6 +28,7 @@ import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -39,7 +40,6 @@ import com.keylesspalace.tusky.entity.Status;
 import com.keylesspalace.tusky.interfaces.StatusActionListener;
 import com.keylesspalace.tusky.interfaces.StatusRemoveListener;
 import com.keylesspalace.tusky.util.EndlessOnScrollListener;
-import com.keylesspalace.tusky.util.Log;
 import com.keylesspalace.tusky.util.TimelineReceiver;
 import com.keylesspalace.tusky.util.ThemeUtils;
 

app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java

@@ -25,6 +25,7 @@ import android.support.v4.widget.SwipeRefreshLayout;
 import android.support.v7.widget.DividerItemDecoration;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -39,7 +40,6 @@ import com.keylesspalace.tusky.R;
 import com.keylesspalace.tusky.interfaces.StatusActionListener;
 import com.keylesspalace.tusky.interfaces.StatusRemoveListener;
 import com.keylesspalace.tusky.util.ConversationLineItemDecoration;
-import com.keylesspalace.tusky.util.Log;
 import com.keylesspalace.tusky.util.ThemeUtils;
 
 import retrofit2.Call;

app/src/main/java/com/keylesspalace/tusky/util/CustomTabURLSpan.java

@@ -9,6 +9,7 @@ import android.preference.PreferenceManager;
 import android.support.customtabs.CustomTabsIntent;
 import android.support.v4.content.ContextCompat;
 import android.text.style.URLSpan;
+import android.util.Log;
 import android.view.View;
 
 import com.keylesspalace.tusky.R;

app/src/main/java/com/keylesspalace/tusky/util/DownsizeImageTask.java

@@ -23,6 +23,7 @@ import android.net.Uri;
 import android.os.AsyncTask;
 import android.support.annotation.Nullable;
 import android.support.media.ExifInterface;
+import android.util.Log;
 
 import java.io.ByteArrayOutputStream;
 import java.io.FileNotFoundException;
@@ -32,6 +33,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class DownsizeImageTask extends AsyncTask<Uri, Void, Boolean> {
+    private static final String TAG = "DownsizeImageTask";
     private int sizeLimit;
     private ContentResolver contentResolver;
     private Listener listener;
@@ -100,6 +102,7 @@ public class DownsizeImageTask extends AsyncTask<Uri, Void, Boolean> {
         try {
             inputStream = contentResolver.openInputStream(uri);
         } catch (FileNotFoundException e) {
+            Log.d(TAG, Log.getStackTraceString(e));
             return ExifInterface.ORIENTATION_UNDEFINED;
         }
         if (inputStream == null) {
@@ -109,6 +112,7 @@ public class DownsizeImageTask extends AsyncTask<Uri, Void, Boolean> {
         try {
             exifInterface = new ExifInterface(inputStream);
         } catch (IOException e) {
+            Log.d(TAG, Log.getStackTraceString(e));
             IOUtils.closeQuietly(inputStream);
             return ExifInterface.ORIENTATION_UNDEFINED;
         }

app/src/main/java/com/keylesspalace/tusky/util/Log.java

@@ -1,53 +0,0 @@
-/* Copyright 2017 Andrew Dawson
- *
- * This file is a part of Tusky.
- *
- * This program is free software; you can redistribute it and/or modify it under the terms of the
- * GNU General Public License as published by the Free Software Foundation; either version 3 of the
- * License, or (at your option) any later version.
- *
- * Tusky is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
- * Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along with Tusky; if not,
- * see <http://www.gnu.org/licenses>. */
-
-package com.keylesspalace.tusky.util;
-
-import com.keylesspalace.tusky.BuildConfig;
-
-/**A wrapper for android.util.Log that allows for disabling logging, such as for release builds.*/
-public class Log {
-    private static final boolean LOGGING_ENABLED = BuildConfig.DEBUG;
-
-    public static void i(String tag, String string) {
-        if (LOGGING_ENABLED) {
-            android.util.Log.i(tag, string);
-        }
-    }
-
-    public static void e(String tag, String string) {
-        if (LOGGING_ENABLED) {
-            android.util.Log.e(tag, string);
-        }
-    }
-
-    public static void d(String tag, String string) {
-        if (LOGGING_ENABLED) {
-            android.util.Log.d(tag, string);
-        }
-    }
-
-    public static void v(String tag, String string) {
-        if (LOGGING_ENABLED) {
-            android.util.Log.v(tag, string);
-        }
-    }
-
-    public static void w(String tag, String string) {
-        if (LOGGING_ENABLED) {
-            android.util.Log.w(tag, string);
-        }
-    }
-}

app/src/main/java/com/keylesspalace/tusky/util/NotificationMaker.java

@@ -28,6 +28,7 @@ import android.provider.Settings;
 import android.support.annotation.Nullable;
 import android.support.v4.app.NotificationCompat;
 import android.support.v4.app.TaskStackBuilder;
+import android.util.Log;
 
 import com.keylesspalace.tusky.MainActivity;
 import com.keylesspalace.tusky.R;
@@ -39,6 +40,9 @@ import org.json.JSONArray;
 import org.json.JSONException;
 
 public class NotificationMaker {
+
+    public static final String TAG = "NotificationMaker";
+
     public static void make(final Context context, final int notifyId, Notification body) {
         final SharedPreferences preferences =
                 PreferenceManager.getDefaultSharedPreferences(context);
@@ -66,7 +70,7 @@ public class NotificationMaker {
                     alreadyContains = true;
                 }
             } catch (JSONException e) {
-                e.printStackTrace();
+                Log.d(TAG, Log.getStackTraceString(e));
             }
         }
 
@@ -127,7 +131,7 @@ public class NotificationMaker {
                 builder.setContentTitle(String.format(context.getString(R.string.notification_title_summary), currentNotifications.length()))
                         .setContentText(truncateWithEllipses(joinNames(context, currentNotifications), 40));
             } catch (JSONException e) {
-                e.printStackTrace();
+                Log.d(TAG, Log.getStackTraceString(e));
             }
         }
 

app/src/main/java/com/keylesspalace/tusky/util/OkHttpUtils.java

@@ -17,6 +17,7 @@ package com.keylesspalace.tusky.util;
 
 import android.os.Build;
 import android.support.annotation.NonNull;
+import android.util.Log;
 
 import com.keylesspalace.tusky.BuildConfig;