#132[1h]. Move event logging to separate class.

Author: Evgenii Kanivets

app/src/main/java/com/blogspot/e_kanivets/moneytracker/MtApp.java

@@ -7,7 +7,9 @@
 import com.blogspot.e_kanivets.moneytracker.di.module.ControllerModule;
 import com.blogspot.e_kanivets.moneytracker.di.module.repo.CachedRepoModule;
 
+import com.blogspot.e_kanivets.moneytracker.util.AnswersProxy;
 import com.crashlytics.android.Crashlytics;
+
 import io.fabric.sdk.android.Fabric;
 import timber.log.Timber;
 
@@ -29,15 +31,18 @@ public static MtApp get() {
     @Override
     public void onCreate() {
         super.onCreate();
-        if (!BuildConfig.DEBUG) {
-            Fabric.with(this, new Crashlytics());
-        }
 
         mtApp = this;
         buildAppComponent();
 
-        if (BuildConfig.DEBUG) Timber.plant(new Timber.DebugTree());
-        else Timber.plant(new ReleaseTree());
+        if (BuildConfig.DEBUG) {
+            Timber.plant(new Timber.DebugTree());
+            AnswersProxy.get().setEnabled(false);
+        } else {
+            Timber.plant(new ReleaseTree());
+            Fabric.with(this, new Crashlytics());
+            AnswersProxy.get().setEnabled(true);
+        }
     }
 
     public AppComponent getAppComponent() {

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AccountsActivity.java

@@ -14,8 +14,7 @@
 import com.blogspot.e_kanivets.moneytracker.adapter.AccountAdapter;
 import com.blogspot.e_kanivets.moneytracker.controller.data.AccountController;
 import com.blogspot.e_kanivets.moneytracker.ui.presenter.AccountsSummaryPresenter;
-import com.crashlytics.android.answers.Answers;
-import com.crashlytics.android.answers.ContentViewEvent;
+import com.blogspot.e_kanivets.moneytracker.util.AnswersProxy;
 
 import javax.inject.Inject;
 
@@ -101,22 +100,14 @@ public boolean onContextItemSelected(MenuItem item) {
     }
 
     public void makeTransfer() {
-        // Answers event
-        Answers.getInstance().logContentView(new ContentViewEvent()
-                .putContentName("Add Transfer")
-                .putContentType("Button"));
-
+        AnswersProxy.get().logButton("Add Transfer");
         startActivityForResult(new Intent(AccountsActivity.this, TransferActivity.class),
                 REQUEST_TRANSFER);
     }
 
     @OnClick(R.id.btn_add_account)
     public void addAccount() {
-        // Answers event
-        Answers.getInstance().logContentView(new ContentViewEvent()
-                .putContentName("Add Account")
-                .putContentType("Button"));
-
+        AnswersProxy.get().logButton("Add Account");
         Intent intent = new Intent(AccountsActivity.this, AddAccountActivity.class);
         startActivityForResult(intent, REQUEST_ADD_ACCOUNT);
     }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/AddAccountActivity.java

@@ -11,10 +11,9 @@
 import com.blogspot.e_kanivets.moneytracker.controller.data.AccountController;
 import com.blogspot.e_kanivets.moneytracker.controller.CurrencyController;
 import com.blogspot.e_kanivets.moneytracker.entity.data.Account;
+import com.blogspot.e_kanivets.moneytracker.util.AnswersProxy;
 import com.blogspot.e_kanivets.moneytracker.util.validator.AccountValidator;
 import com.blogspot.e_kanivets.moneytracker.util.validator.IValidator;
-import com.crashlytics.android.answers.Answers;
-import com.crashlytics.android.answers.ContentViewEvent;
 
 import java.util.ArrayList;
 
@@ -79,17 +78,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
     }
 
     private void tryAddAccount() {
-        // Answers event
-        Answers.getInstance().logContentView(new ContentViewEvent()
-                .putContentName("Done Account")
-                .putContentType("Button"));
-
+        AnswersProxy.get().logButton("Done Account");
         if (addAccount()) {
-            // Answers event
-            Answers.getInstance().logContentView(new ContentViewEvent()
-                    .putContentName("Done Account")
-                    .putContentType("Event"));
-
+            AnswersProxy.get().logEvent("Done Account");
             setResult(RESULT_OK);
             finish();
         }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/account/TransferActivity.java

@@ -12,10 +12,9 @@
 import com.blogspot.e_kanivets.moneytracker.controller.data.TransferController;
 import com.blogspot.e_kanivets.moneytracker.entity.data.Account;
 import com.blogspot.e_kanivets.moneytracker.entity.data.Transfer;
+import com.blogspot.e_kanivets.moneytracker.util.AnswersProxy;
 import com.blogspot.e_kanivets.moneytracker.util.validator.IValidator;
 import com.blogspot.e_kanivets.moneytracker.util.validator.TransferValidator;
-import com.crashlytics.android.answers.Answers;
-import com.crashlytics.android.answers.ContentViewEvent;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -100,17 +99,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
     }
 
     private void tryTransfer() {
-        // Answers event
-        Answers.getInstance().logContentView(new ContentViewEvent()
-                .putContentName("Done Transfer")
-                .putContentType("Button"));
-
+        AnswersProxy.get().logButton("Done Transfer");
         if (doTransfer()) {
-            // Answers event
-            Answers.getInstance().logContentView(new ContentViewEvent()
-                    .putContentName("Done Transfer")
-                    .putContentType("Event"));
-
+            AnswersProxy.get().logEvent("Done Transfer");
             setResult(RESULT_OK);
             finish();
         }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/base/BaseDrawerActivity.java

@@ -1,6 +1,7 @@
 package com.blogspot.e_kanivets.moneytracker.activity.base;
 
 import android.content.Intent;
+import android.support.annotation.NonNull;
 import android.support.design.widget.NavigationView;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
@@ -15,8 +16,7 @@
 import com.blogspot.e_kanivets.moneytracker.activity.SettingsActivity;
 import com.blogspot.e_kanivets.moneytracker.activity.account.AccountsActivity;
 import com.blogspot.e_kanivets.moneytracker.activity.exchange_rate.ExchangeRatesActivity;
-import com.crashlytics.android.answers.Answers;
-import com.crashlytics.android.answers.ContentViewEvent;
+import com.blogspot.e_kanivets.moneytracker.util.AnswersProxy;
 
 import butterknife.Bind;
 
@@ -71,7 +71,7 @@ protected void initViews() {
     }
 
     @Override
-    public boolean onNavigationItemSelected(MenuItem item) {
+    public boolean onNavigationItemSelected(@NonNull MenuItem item) {
         switch (item.getItemId()) {
             case R.id.nav_accounts:
                 showAccounts();
@@ -134,60 +134,36 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
     }
 
     private void showAccounts() {
-        // Answers event
-        Answers.getInstance().logContentView(new ContentViewEvent()
-                .putContentName("Show Accounts")
-                .putContentType("Button"));
-
+        AnswersProxy.get().logButton("Show Accounts");
         startActivityForResult(new Intent(BaseDrawerActivity.this, AccountsActivity.class),
                 REQUEST_ACCOUNTS);
     }
 
     private void showRates() {
-        // Answers event
-        Answers.getInstance().logContentView(new ContentViewEvent()
-                .putContentName("Show Rates")
-                .putContentType("Button"));
-
+        AnswersProxy.get().logButton("Show Rates");
         startActivityForResult(new Intent(BaseDrawerActivity.this, ExchangeRatesActivity.class),
                 REQUEST_RATES);
     }
 
     private void showCharts() {
-        // Answers event
-        Answers.getInstance().logContentView(new ContentViewEvent()
-                .putContentName("Show Charts")
-                .putContentType("Button"));
-
+        AnswersProxy.get().logButton("Show Charts");
         startActivity(new Intent(BaseDrawerActivity.this, ChartsActivity.class));
     }
 
     private void showBackup() {
-        // Answers event
-        Answers.getInstance().logContentView(new ContentViewEvent()
-                .putContentName("Show Backup")
-                .putContentType("Button"));
-
+        AnswersProxy.get().logButton("Show Backup");
         startActivityForResult(new Intent(BaseDrawerActivity.this, BackupActivity.class),
                 REQUEST_BACKUP);
     }
 
     private void showImportExport() {
-        // Answers event
-        Answers.getInstance().logContentView(new ContentViewEvent()
-                .putContentName("Show Import Export")
-                .putContentType("Button"));
-
+        AnswersProxy.get().logButton("Show Import Export");
         startActivityForResult(new Intent(BaseDrawerActivity.this, ImportExportActivity.class),
                 REQUEST_IMPORT_EXPORT);
     }
 
     private void showSettings() {
-        // Answers event
-        Answers.getInstance().logContentView(new ContentViewEvent()
-                .putContentName("Show Settings")
-                .putContentType("Button"));
-
+        AnswersProxy.get().logButton("Show Settings");
         startActivityForResult(new Intent(BaseDrawerActivity.this, SettingsActivity.class),
                 REQUEST_SETTINGS);
     }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/exchange_rate/AddExchangeRateActivity.java

@@ -14,10 +14,9 @@
 import com.blogspot.e_kanivets.moneytracker.controller.FormatController;
 import com.blogspot.e_kanivets.moneytracker.controller.data.ExchangeRateController;
 import com.blogspot.e_kanivets.moneytracker.entity.ExchangeRatePair;
+import com.blogspot.e_kanivets.moneytracker.util.AnswersProxy;
 import com.blogspot.e_kanivets.moneytracker.util.validator.ExchangeRatePairValidator;
 import com.blogspot.e_kanivets.moneytracker.util.validator.IValidator;
-import com.crashlytics.android.answers.Answers;
-import com.crashlytics.android.answers.ContentViewEvent;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -127,17 +126,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
     }
 
     private void tryAddExchangeRate() {
-        // Answers event
-        Answers.getInstance().logContentView(new ContentViewEvent()
-                .putContentName("Done Exchange Rate")
-                .putContentType("Button"));
-
+        AnswersProxy.get().logButton("Done Exchange Rate");
         if (addExchangeRate()) {
-            // Answers event
-            Answers.getInstance().logContentView(new ContentViewEvent()
-                    .putContentName("Done Exchange Rate")
-                    .putContentType("Event"));
-
+            AnswersProxy.get().logEvent("Done Exchange Rate");
             setResult(RESULT_OK);
             finish();
         }

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/exchange_rate/ExchangeRatesActivity.java

@@ -14,9 +14,8 @@
 import com.blogspot.e_kanivets.moneytracker.adapter.ExchangeRateAdapter;
 import com.blogspot.e_kanivets.moneytracker.controller.data.ExchangeRateController;
 import com.blogspot.e_kanivets.moneytracker.entity.ExchangeRatePair;
+import com.blogspot.e_kanivets.moneytracker.util.AnswersProxy;
 import com.blogspot.e_kanivets.moneytracker.util.ExchangeRatesSummarizer;
-import com.crashlytics.android.answers.Answers;
-import com.crashlytics.android.answers.ContentViewEvent;
 
 import java.util.Collections;
 import java.util.List;
@@ -81,34 +80,22 @@ public boolean onContextItemSelected(MenuItem item) {
     }
 
     public void deleteExchangeRate(int position) {
-        // Answers event
-        Answers.getInstance().logContentView(new ContentViewEvent()
-                .putContentName("Delete Exchange Rate")
-                .putContentType("Button"));
-
+        AnswersProxy.get().logButton("Delete Exchange Rate");
         rateController.deleteExchangeRatePair(exchangeRateList.get(position));
         update();
         setResult(RESULT_OK);
     }
 
     @OnClick(R.id.btn_add_exchange_rate)
     public void addExchangeRate() {
-        // Answers event
-        Answers.getInstance().logContentView(new ContentViewEvent()
-                .putContentName("Add Exchange Rate")
-                .putContentType("Button"));
-
+        AnswersProxy.get().logButton("Add Exchange Rate");
         Intent intent = new Intent(ExchangeRatesActivity.this, AddExchangeRateActivity.class);
         startActivityForResult(intent, REQUEST_ADD_EXCHANGE_RATE);
     }
 
     @OnItemClick(R.id.list_view)
     public void addExchangeRateOnBaseOfExisted(int position) {
-        // Answers event
-        Answers.getInstance().logContentView(new ContentViewEvent()
-                .putContentName("Edit Exchange Rate")
-                .putContentType("Button"));
-
+        AnswersProxy.get().logButton("Edit Exchange Rate");
         if (position < 0 || position >= exchangeRateList.size()) return;
         Intent intent = new Intent(ExchangeRatesActivity.this, AddExchangeRateActivity.class);
         intent.putExtra(AddExchangeRateActivity.KEY_EXCHANGE_RATE, exchangeRateList.get(position));

app/src/main/java/com/blogspot/e_kanivets/moneytracker/activity/external/BackupActivity.java

@@ -12,8 +12,7 @@
 import com.blogspot.e_kanivets.moneytracker.activity.base.BaseBackActivity;
 import com.blogspot.e_kanivets.moneytracker.controller.BackupController;
 import com.blogspot.e_kanivets.moneytracker.controller.PreferenceController;
-import com.crashlytics.android.answers.Answers;
-import com.crashlytics.android.answers.ContentViewEvent;
+import com.blogspot.e_kanivets.moneytracker.util.AnswersProxy;
 import com.dropbox.client2.DropboxAPI;
 import com.dropbox.client2.android.AndroidAuthSession;
 import com.dropbox.client2.session.AppKeyPair;
@@ -91,20 +90,12 @@ protected void onResume() {
 
     @OnClick(R.id.btn_backup_now)
     public void backupNow() {
-        // Answers event
-        Answers.getInstance().logContentView(new ContentViewEvent()
-                .putContentName("Make Backup")
-                .putContentType("Button"));
-
+        AnswersProxy.get().logButton("Make Backup");
         startProgress(getString(R.string.making_backup));
         backupController.makeBackup(dbApi, new BackupController.OnBackupListener() {
             @Override
             public void onBackupSuccess() {
-                // Answers event
-                Answers.getInstance().logContentView(new ContentViewEvent()
-                        .putContentName("Backup success")
-                        .putContentType("Event"));
-
+                AnswersProxy.get().logEvent("Backup success");
                 Timber.d("Backup success.");
                 if (isFinishing()) return;
 
@@ -114,11 +105,7 @@ public void onBackupSuccess() {
 
             @Override
             public void onBackupFailure(String reason) {
-                // Answers event
-                Answers.getInstance().logContentView(new ContentViewEvent()
-                        .putContentName("Backup failure")
-                        .putContentType("Event"));
-
+                AnswersProxy.get().logEvent("Backup failure");
                 Timber.d("Backup failure.");
                 if (isFinishing()) return;
 
@@ -132,11 +119,7 @@ public void onBackupFailure(String reason) {
 
     @OnItemClick(R.id.list_view)
     public void restoreBackupClicked(int position) {
-        // Answers event
-        Answers.getInstance().logContentView(new ContentViewEvent()
-                .putContentName("Restore backup")
-                .putContentType("Button"));
-
+        AnswersProxy.get().logButton("Restore backup");
         final String backupName = listView.getAdapter().getItem(position).toString();
 
         AlertDialog.Builder builder = new AlertDialog.Builder(BackupActivity.this);
@@ -157,11 +140,7 @@ private void restoreBackup(final String backupName) {
         backupController.restoreBackup(dbApi, backupName, new BackupController.OnRestoreBackupListener() {
             @Override
             public void onRestoreSuccess() {
-                // Answers event
-                Answers.getInstance().logContentView(new ContentViewEvent()
-                        .putContentName("Restore Success")
-                        .putContentType("Event"));
-
+                AnswersProxy.get().logEvent("Restore Success");
                 Timber.d("Restore success.");
                 if (isFinishing()) return;
 
@@ -184,11 +163,7 @@ public void onDismiss(DialogInterface dialog) {
 
             @Override
             public void onRestoreFailure(String reason) {
-                // Answers event
-                Answers.getInstance().logContentView(new ContentViewEvent()
-                        .putContentName("Restore Failure")
-                        .putContentType("Event"));
-
+                AnswersProxy.get().logEvent("Restore Failure");
                 Timber.d("Restore failure.");
                 if (isFinishing()) return;