Removes printstacktrace usage (#403)

fieldsight · Oct 15, 2019 · aa16c7f · aa16c7f
1 parent 6e1edac
commit aa16c7f
Show file tree

Hide file tree

Showing 35 changed files with 168 additions and 140 deletions.
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/common/FieldSightUserSession.java b/collect_app/src/main/java/org/fieldsight/naxa/common/FieldSightUserSession.java
@@ -139,7 +139,7 @@ protected Void doInBackground(Void... voids) {
             try {
                 FirebaseInstanceId.getInstance().deleteInstanceId();
             } catch (Exception e) {
-                e.printStackTrace();
+                Timber.e(e);
             }
             return null;
         }
@@ -361,7 +361,7 @@ private static Long[] getAllFormsIds() {
                 }
             }
         } catch (NumberFormatException e) {
-            e.printStackTrace();//should never happen
+            Timber.e(e);//should never happen
         } finally {
             if (results != null) {
                 results.close();
@@ -387,7 +387,7 @@ private static Long[] getAllInstancedsIds() {
                 }
             }
         } catch (NumberFormatException e) {
-            e.printStackTrace();//should never happen
+            Timber.e(e);//should never happen
         } finally {
             if (results != null) {
                 results.close();

diff --git a/collect_app/src/main/java/org/fieldsight/naxa/common/SharedPreferenceUtils.java b/collect_app/src/main/java/org/fieldsight/naxa/common/SharedPreferenceUtils.java
@@ -6,6 +6,8 @@
 
 import org.odk.collect.android.application.Collect;
 
+import timber.log.Timber;
+
 public class SharedPreferenceUtils {
 
     public static class PREF_KEY {
@@ -80,7 +82,7 @@ public static String getFromPrefs(Context context, String key, String defaultVal
         try {
             return sharedPrefs.getString(key, defaultValue);
         } catch (Exception e) {
-            e.printStackTrace();
+            Timber.e(e);
             return defaultValue;
         }
     }
@@ -91,7 +93,7 @@ public static Boolean getBooleanFromPrefs(Context context, String key, Boolean d
         try {
             return sharedPrefs.getBoolean(key, defaultValue);
         } catch (Exception e) {
-            e.printStackTrace();
+            Timber.e(e);
             return defaultValue;
         }
     }

diff --git a/collect_app/src/main/java/org/fieldsight/naxa/common/utilities/ZipUtils.java b/collect_app/src/main/java/org/fieldsight/naxa/common/utilities/ZipUtils.java
@@ -10,6 +10,8 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
+import timber.log.Timber;
+
 public class ZipUtils {
     /*
      *
@@ -90,7 +92,7 @@ public boolean zipFileAtPath(String sourcePath, String toLocation) {
                 listener.onComplete();
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            Timber.e(e);
             return false;
         }
         return true;

diff --git a/...rc/main/java/org/fieldsight/naxa/data/source/local/FieldSightNotificationLocalSource.java b/...rc/main/java/org/fieldsight/naxa/data/source/local/FieldSightNotificationLocalSource.java
@@ -362,7 +362,7 @@ public FieldSightNotification parseNotificationData(JSONObject jsonObject) {
                     siteIdentifier = siteData.getString("identifier");
                 }
             } catch (JSONException e) {
-                e.printStackTrace();
+                Timber.e(e);
 
             }
         }
@@ -377,7 +377,7 @@ public FieldSightNotification parseNotificationData(JSONObject jsonObject) {
                     projectId = siteData.getString("id");
                 }
             } catch (JSONException e) {
-                e.printStackTrace();
+                Timber.e(e);
 
             }
         }

diff --git a/collect_app/src/main/java/org/fieldsight/naxa/educational/EducationalMaterialActivity.java b/collect_app/src/main/java/org/fieldsight/naxa/educational/EducationalMaterialActivity.java
@@ -41,6 +41,7 @@
 import io.reactivex.functions.Function;
 import io.reactivex.observers.DisposableSingleObserver;
 import io.reactivex.schedulers.Schedulers;
+import timber.log.Timber;
 
 import static org.fieldsight.naxa.common.Constant.EXTRA_MESSAGE;
 import static org.fieldsight.naxa.common.Constant.EXTRA_OBJECT;
@@ -270,7 +271,7 @@ public void onSuccess(List<Fragment> dynamicFragments) {
 
                     @Override
                     public void onError(Throwable e) {
-                        e.printStackTrace();
+                        Timber.e(e);
                         if (e instanceof EmptyResultSetException) {
                             ToastUtils.showLongToast("No education materials present for this form");
                         } else {

diff --git a/...ct_app/src/main/java/org/fieldsight/naxa/firebase/FieldSightFirebaseMessagingService.java b/...ct_app/src/main/java/org/fieldsight/naxa/firebase/FieldSightFirebaseMessagingService.java
@@ -196,7 +196,7 @@ private void parseNotificationData(Map<String, String> notificationData) {
                     siteIdentifier = siteData.getString("identifier");
                 }
             } catch (JSONException e) {
-                e.printStackTrace();
+                Timber.e(e);
 
             }
         }
@@ -211,7 +211,7 @@ private void parseNotificationData(Map<String, String> notificationData) {
                     projectId = siteData.getString("id");
                 }
             } catch (JSONException e) {
-                e.printStackTrace();
+                Timber.e(e);
 
             }
         }

diff --git a/collect_app/src/main/java/org/fieldsight/naxa/forms/data/local/FieldsightFormDetailsv3.java b/collect_app/src/main/java/org/fieldsight/naxa/forms/data/local/FieldsightFormDetailsv3.java
@@ -173,7 +173,7 @@ public static FieldsightFormDetailsv3 parseFromJSON(JSONObject jsonObject, Strin
             }
             fieldsightFormDetailsv3.setMetaAttributes(metaJSON.toString());
         } catch (Exception e) {
-            e.printStackTrace();
+            Timber.e(e);
         }
         return fieldsightFormDetailsv3;
     }
@@ -193,7 +193,7 @@ public static void getMetaJSON(String prefix, JSONObject fromJSON, JSONObject at
                 atJSON.put(prefix + "_regions", fromJSON.optJSONArray("regions"));
             }
         } catch (Exception e) {
-            e.printStackTrace();
+            Timber.e(e);
         }
     }
 
@@ -233,7 +233,7 @@ public static List<FieldsightFormDetailsv3> fieldsightFormDetailsV3FromJSON(JSON
                 }
 
             } catch (Exception e) {
-                e.printStackTrace();
+                Timber.e(e);
             }
         }
         return fieldsightFormDetailsNewArrayList;

diff --git a/collect_app/src/main/java/org/fieldsight/naxa/forms/ui/EducationalMaterialListActivity.java b/collect_app/src/main/java/org/fieldsight/naxa/forms/ui/EducationalMaterialListActivity.java
@@ -190,7 +190,7 @@ public void onSuccess(List<Fragment> dynamicFragments) {
 
                     @Override
                     public void onError(Throwable e) {
-                        e.printStackTrace();
+                        Timber.e(e);
                         if (e instanceof EmptyResultSetException) {
                             ToastUtils.showLongToast("No education materials present for this form");
                         } else {

diff --git a/collect_app/src/main/java/org/fieldsight/naxa/generalforms/data/GeneralFormLocalSource.java b/collect_app/src/main/java/org/fieldsight/naxa/generalforms/data/GeneralFormLocalSource.java
@@ -116,7 +116,7 @@ public void onSuccess(List<GeneralFormAndSubmission> generalFormAndSubmissions)
 
                                         @Override
                                         public void onError(Throwable e) {
-                                            e.printStackTrace();
+                                            Timber.e(e);
                                             generalFormMediator.removeSource(source);
                                         }
                                     });

diff --git a/collect_app/src/main/java/org/fieldsight/naxa/helpers/FSInstancesDao.java b/collect_app/src/main/java/org/fieldsight/naxa/helpers/FSInstancesDao.java
@@ -218,7 +218,7 @@ private String fixUploadUrl(String url) {
                 url = generateSubmissionUrl(deployedFrom, siteId, fsFormId);
             }
         } catch (NullPointerException e) {
-            e.printStackTrace();
+            Timber.e(e);
             Timber.e("Failed to fix url");
         }
         return url;

diff --git a/collect_app/src/main/java/org/fieldsight/naxa/login/APIErrorUtils.java b/collect_app/src/main/java/org/fieldsight/naxa/login/APIErrorUtils.java
diff --git a/collect_app/src/main/java/org/fieldsight/naxa/login/BaseLoginActivity.java b/collect_app/src/main/java/org/fieldsight/naxa/login/BaseLoginActivity.java
@@ -84,7 +84,7 @@ public void onActivityResult(int requestCode, int resultCode, Intent data) {
                 handleSignInResult(task);
             } catch (Exception e) {
 
-                e.printStackTrace();
+                Timber.e(e);
             }
         }
 
@@ -98,7 +98,7 @@ protected void handleSignInResult(@NonNull Task<GoogleSignInAccount> completedTa
             Timber.d("handleSignInResult: suthCode " + authCode);
             updateUI(account);
         } catch (ApiException e) {
-            e.printStackTrace();
+            Timber.e(e);
             gmailLoginFailed(e.getMessage());
             Log.w(TAG, "signInResult:failed code=" + e.getStatusCode());
             updateUI(null);

diff --git a/collect_app/src/main/java/org/fieldsight/naxa/onboarding/DownloadActivity.java b/collect_app/src/main/java/org/fieldsight/naxa/onboarding/DownloadActivity.java
@@ -241,7 +241,7 @@ public void onSuccess(List<SyncableItem> syncableItems) {
 
                     @Override
                     public void onError(Throwable e) {
-                        e.printStackTrace();
+                        Timber.e(e);
                     }
                 });
 

diff --git a/collect_app/src/main/java/org/fieldsight/naxa/onboarding/DownloadModelImpl.java b/collect_app/src/main/java/org/fieldsight/naxa/onboarding/DownloadModelImpl.java
@@ -92,7 +92,7 @@ public void onSuccess(Object o) {
 
                     @Override
                     public void onError(Throwable e) {
-                        e.printStackTrace();
+                        Timber.e(e);
                         SyncRepository.getInstance().setError(Constant.DownloadUID.GENERAL_FORMS);
                     }
                 });

diff --git a/collect_app/src/main/java/org/fieldsight/naxa/onboarding/XMLFormDownloadService.java b/collect_app/src/main/java/org/fieldsight/naxa/onboarding/XMLFormDownloadService.java
@@ -195,7 +195,7 @@ public void onNext(List<Project> projects) {
                     @Override
                     public void onError(Throwable e) {
                         Timber.i("onError");
-                        e.printStackTrace();
+                        Timber.e(e);
                         broadcastDownloadError(e.getMessage());
                     }
 

diff --git a/collect_app/src/main/java/org/fieldsight/naxa/profile/UserActivity.java b/collect_app/src/main/java/org/fieldsight/naxa/profile/UserActivity.java
@@ -37,6 +37,7 @@
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import io.reactivex.observers.DisposableObserver;
+import timber.log.Timber;
 
 public class UserActivity extends CollectAbstractActivity {
 
@@ -315,7 +316,7 @@ public void onNext(User user) {
 
                             @Override
                             public void onError(Throwable e) {
-                                e.printStackTrace();
+                                Timber.e(e);
                                 userProfileViewModel.setProgressBar(false);
                                 userProfileViewModel.setSyncLiveData(false);
                                 mUser.setSync(false);

diff --git a/collect_app/src/main/java/org/fieldsight/naxa/report/ReportActivity.java b/collect_app/src/main/java/org/fieldsight/naxa/report/ReportActivity.java
@@ -44,6 +44,7 @@
 import io.reactivex.observers.DisposableObserver;
 import io.reactivex.schedulers.Schedulers;
 import okhttp3.ResponseBody;
+import timber.log.Timber;
 
 public class ReportActivity extends CollectAbstractActivity {
     @BindView(R.id.tv_device_id)
@@ -170,7 +171,7 @@ public void onNext(ResponseBody response) {
                                     hideProgressDialog();
                                 }
                             } catch (IOException | JSONException e) {
-                                e.printStackTrace();
+                                Timber.e(e);
                                 isSubmitting = false;
                                 hideProgressDialog();
                                 Toast.makeText(getApplicationContext(), "Unknown error in sending report, Please try again", Toast.LENGTH_SHORT).show();

diff --git a/collect_app/src/main/java/org/fieldsight/naxa/scheduled/data/ScheduledFormsLocalSource.java b/collect_app/src/main/java/org/fieldsight/naxa/scheduled/data/ScheduledFormsLocalSource.java
@@ -25,6 +25,7 @@
 import io.reactivex.disposables.Disposable;
 import io.reactivex.functions.Function;
 import io.reactivex.schedulers.Schedulers;
+import timber.log.Timber;
 
 import static org.fieldsight.naxa.common.Constant.FormDeploymentFrom.SITE;
 
@@ -148,7 +149,7 @@ public void onSuccess(List<ScheduledFormAndSubmission> generalFormAndSubmissions
 
                                         @Override
                                         public void onError(Throwable e) {
-                                            e.printStackTrace();
+                                            Timber.e(e);
                                             generalFormMediator.removeSource(source);
                                         }
                                     });
@@ -213,7 +214,7 @@ public void onSuccess(List<ScheduledFormAndSubmission> generalFormAndSubmissions
 
                                         @Override
                                         public void onError(Throwable e) {
-                                            e.printStackTrace();
+                                            Timber.e(e);
                                             generalFormMediator.removeSource(source);
                                         }
                                     });

diff --git a/collect_app/src/main/java/org/fieldsight/naxa/site/CreateSiteActivity.java b/collect_app/src/main/java/org/fieldsight/naxa/site/CreateSiteActivity.java
@@ -908,7 +908,7 @@ public String getAnswerFormMetaAttrs(String submissionTag) {
                 }
             } catch (JSONException e) {
                 Timber.e(e);
-                e.printStackTrace();
+                Timber.e(e);
             }
         }
 

diff --git a/collect_app/src/main/java/org/fieldsight/naxa/site/SiteListFragment.java b/collect_app/src/main/java/org/fieldsight/naxa/site/SiteListFragment.java
@@ -159,7 +159,7 @@ private TermsLabels getTermsAndLabels() {
                 JSONObject tlJson = new JSONObject(loadedProject.getTerms_and_labels());
                 return TermsLabels.fromJSON(tlJson);
             } catch (Exception e) {
-                e.printStackTrace();
+                Timber.e(e);
                 return null;
             }
         } else {
@@ -511,7 +511,7 @@ public void onSuccess(List<Long> instanceIDs) {
 
                     @Override
                     public void onError(Throwable e) {
-                        e.printStackTrace();
+                        Timber.e(e);
                         Timber.e(e);
                         String message;
                         if (e instanceof RetrofitException && ((RetrofitException) e).getResponse().errorBody() == null) {

diff --git a/collect_app/src/main/java/org/fieldsight/naxa/submissions/PaginationAdapter.java b/collect_app/src/main/java/org/fieldsight/naxa/submissions/PaginationAdapter.java
@@ -18,6 +18,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import timber.log.Timber;
+
 
 public class PaginationAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
@@ -114,7 +116,7 @@ private String formatSubmissionDateTime(String dateTime) {
 
 
         } catch (Exception e) {
-            e.printStackTrace();
+            Timber.e(e);
             msg = "Cannot load date time";
         }
 

diff --git a/...ect_app/src/main/java/org/fieldsight/naxa/submissions/PreviousSubmissionListActivity.java b/...ect_app/src/main/java/org/fieldsight/naxa/submissions/PreviousSubmissionListActivity.java
@@ -203,7 +203,7 @@ public void onNext(FormHistoryResponse response) {
                     public void onError(Throwable e) {
                         progressBar.setVisibility(View.GONE);
                         ToastUtils.showLongToast(e.getMessage());
-                        e.printStackTrace();
+                        Timber.e(e);
                     }
 
                     @Override
@@ -321,7 +321,7 @@ public void onNext(FormHistoryResponse response) {
                     public void onError(Throwable e) {
                         progressBar.setVisibility(View.GONE);
                         ToastUtils.showLongToast(e.getMessage());
-                        e.printStackTrace();
+                        Timber.e(e);
                     }
 
                     @Override

diff --git a/collect_app/src/main/java/org/fieldsight/naxa/substages/data/SubStageLocalSource.java b/collect_app/src/main/java/org/fieldsight/naxa/substages/data/SubStageLocalSource.java
@@ -27,6 +27,7 @@
 import io.reactivex.functions.Function;
 import io.reactivex.observers.DisposableSingleObserver;
 import io.reactivex.schedulers.Schedulers;
+import timber.log.Timber;
 
 import static org.fieldsight.naxa.common.Constant.FormDeploymentFrom.SITE;
 
@@ -119,7 +120,7 @@ public void onSuccess(List<SubStageAndSubmission> subStageAndSubmissions) {
 
                                 @Override
                                 public void onError(Throwable e) {
-                                    e.printStackTrace();
+                                    Timber.e(e);
                                     mediatorLiveData.removeSource(source);
                                 }
                             });

diff --git a/collect_app/src/main/java/org/fieldsight/naxa/survey/SurveyFormsActivity.java b/collect_app/src/main/java/org/fieldsight/naxa/survey/SurveyFormsActivity.java
@@ -173,7 +173,7 @@ protected void fillODKForm(String idString) {
 
             }
         } catch (NullPointerException | NumberFormatException e) {
-            e.printStackTrace();
+            Timber.e(e);
             DialogFactory.createGenericErrorDialog(this, e.getMessage()).show();
             Timber.e("Failed to load xml form %s", e.getMessage());
         } catch (CursorIndexOutOfBoundsException e) {