Skip to content
Snippets Groups Projects
Commit 1bc6730c authored by John Carlson's avatar John Carlson
Browse files

Update Timber calls to be more clean

parent 04f355cb
No related branches found
No related tags found
No related merge requests found
Pipeline #
Hide whitespace changes
Inline Side-by-side
Showing
with 61 additions and 77 deletions
app/build.gradle
+ 14
− 14
View file @ 1bc6730c
@@ -74,12 +74,12 @@ dependencies {
releaseCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2'
testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.4-beta2'
 
compile 'com.android.support:appcompat-v7:24.2.0'
compile 'com.android.support:design:24.2.0'
compile 'com.android.support:recyclerview-v7:24.2.0'
compile 'com.android.support:cardview-v7:24.2.0'
compile 'com.android.support:palette-v7:24.2.0'
compile 'com.android.support:customtabs:24.2.0'
compile 'com.android.support:appcompat-v7:24.2.1'
compile 'com.android.support:design:24.2.1'
compile 'com.android.support:recyclerview-v7:24.2.1'
compile 'com.android.support:cardview-v7:24.2.1'
compile 'com.android.support:palette-v7:24.2.1'
compile 'com.android.support:customtabs:24.2.1'
compile 'com.squareup.retrofit2:retrofit:2.1.0'
compile('com.squareup.retrofit2:converter-simplexml:2.1.0') {
exclude group: 'xpp3', module: 'xpp3'
@@ -93,12 +93,12 @@ dependencies {
compile 'com.squareup.picasso:picasso:2.5.2'
compile 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.0.2'
compile 'org.greenrobot:eventbus:3.0.0'
compile 'io.reactivex:rxjava:1.1.10'
compile 'com.artemzin.rxjava:proguard-rules:1.1.9.0'
compile 'io.reactivex:rxjava:1.2.0'
compile 'com.artemzin.rxjava:proguard-rules:1.2.0.0'
compile 'io.reactivex:rxandroid:1.2.1'
compile 'com.jakewharton:butterknife:8.4.0'
apt 'com.jakewharton:butterknife-compiler:8.4.0'
compile 'com.jakewharton.timber:timber:4.3.0'
compile 'com.jakewharton.timber:timber:4.3.1'
apt 'com.bluelinelabs:logansquare-compiler:1.3.7'
compile 'com.bluelinelabs:logansquare:1.3.7'
compile 'net.danlew:android.joda:2.9.4.1'
@@ -114,7 +114,7 @@ dependencies {
compile 'com.github.Commit451:BypassPicassoImageGetter:1.1.0'
compile 'com.github.Commit451:Jounce:1.0.1'
compile 'com.github.Commit451:EasyCallback:2.1.1'
compile 'com.github.Commit451:ForegroundViews:2.1.0'
compile 'com.github.Commit451:ForegroundViews:2.2.0'
compile 'me.zhanghai.android.materialprogressbar:library:1.1.7'
compile 'com.github.Jawnnypoo:PhysicsLayout:2.1.0'
compile 'com.alexgwyn.recyclerviewsquire:recyclerviewsquire:0.0.5'
@@ -124,18 +124,18 @@ dependencies {
compile 'com.wdullaer:materialdatetimepicker:2.5.0'
compile 'com.wefika:flowlayout:0.4.1'
compile 'com.github.novoda:simple-chrome-custom-tabs:0.1.3-rc1'
compile 'com.afollestad.material-dialogs:core:0.9.0.1'
compile 'com.afollestad.material-dialogs:commons:0.9.0.1'
compile 'com.afollestad.material-dialogs:core:0.9.0.2'
compile 'com.afollestad.material-dialogs:commons:0.9.0.2'
compile 'de.hdodenhof:circleimageview:2.1.0'
compile ('com.vdurmont:emoji-java:3.1.3') {
exclude group: 'org.json', module: 'json'
}
compile 'com.github.jkwiecien:EasyImage:1.2.4'
compile 'com.github.jkwiecien:EasyImage:1.3.0'
compile ('com.github.ozodrukh:CircularReveal:2.0.1@aar') {
transitive = true;
}
 
normalCompile('com.crashlytics.sdk.android:crashlytics:2.6.2@aar') {
normalCompile('com.crashlytics.sdk.android:crashlytics:2.6.4@aar') {
transitive = true;
}
}
app/src/main/java/com/commit451/gitlab/App.java
+ 1
− 1
View file @ 1bc6730c
@@ -112,7 +112,7 @@ public class App extends Application {
res.updateConfiguration(configuration, res.getDisplayMetrics());
}
} catch (Exception e) {
Timber.e(e, null);
Timber.e(e);
}
}
 
app/src/main/java/com/commit451/gitlab/activity/AboutActivity.java
+ 1
− 1
View file @ 1bc6730c
@@ -100,7 +100,7 @@ public class AboutActivity extends BaseActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
mProgress.setVisibility(View.GONE);
Snackbar.make(mRoot, R.string.failed_to_load_contributors, Snackbar.LENGTH_SHORT)
.show();
app/src/main/java/com/commit451/gitlab/activity/AddIssueActivity.java
+ 5
− 5
View file @ 1bc6730c
@@ -126,7 +126,7 @@ public class AddIssueActivity extends MorphActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
mMilestoneProgress.setVisibility(View.GONE);
mMilestoneSpinner.setVisibility(View.GONE);
}
@@ -146,7 +146,7 @@ public class AddIssueActivity extends MorphActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
mAssigneeSpinner.setVisibility(View.GONE);
mAssigneeProgress.setVisibility(View.GONE);
}
@@ -161,7 +161,7 @@ public class AddIssueActivity extends MorphActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
mAssigneeSpinner.setVisibility(View.GONE);
mAssigneeProgress.setVisibility(View.GONE);
}
@@ -177,7 +177,7 @@ public class AddIssueActivity extends MorphActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
//null body could just mean no labels have been created for this project
if (t instanceof NullBodyException) {
setLabels(new ArrayList<Label>());
@@ -203,7 +203,7 @@ public class AddIssueActivity extends MorphActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
Snackbar.make(mRoot, getString(R.string.failed_to_create_issue), Snackbar.LENGTH_SHORT)
.show();
}
app/src/main/java/com/commit451/gitlab/activity/AddLabelActivity.java
+ 1
− 1
View file @ 1bc6730c
@@ -132,7 +132,7 @@ public class AddLabelActivity extends BaseActivity {
public void failure(Throwable t) {
mSwipeRefreshLayout.setRefreshing(false);
mTextMessage.setVisibility(View.VISIBLE);
Timber.e(t, null);
Timber.e(t);
}
});
}
app/src/main/java/com/commit451/gitlab/activity/AddMilestoneActivity.java
+ 2
− 3
View file @ 1bc6730c
@@ -16,10 +16,9 @@ import android.widget.EditText;
import android.widget.FrameLayout;
 
import com.commit451.easel.Easel;
import com.commit451.easycallback.EasyCallback;
import com.commit451.gitlab.App;
import com.commit451.gitlab.R;
import com.commit451.easycallback.EasyCallback;
import com.commit451.gitlab.api.GitLabFactory;
import com.commit451.gitlab.event.MilestoneChangedEvent;
import com.commit451.gitlab.event.MilestoneCreatedEvent;
import com.commit451.gitlab.model.api.Milestone;
@@ -125,7 +124,7 @@ public class AddMilestoneActivity extends MorphActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
mProgress.setVisibility(View.GONE);
showError();
}
app/src/main/java/com/commit451/gitlab/activity/AddNewLabelActivity.java
+ 1
− 1
View file @ 1bc6730c
@@ -74,7 +74,7 @@ public class AddNewLabelActivity extends BaseActivity implements ColorChooserDia
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
mProgress.setVisibility(View.GONE);
if (t instanceof HttpException && ((HttpException) t).response().code() == 409) {
Snackbar.make(mRoot, R.string.label_already_exists, Snackbar.LENGTH_SHORT)
app/src/main/java/com/commit451/gitlab/activity/AddUserActivity.java
+ 3
− 3
View file @ 1bc6730c
@@ -192,7 +192,7 @@ public class AddUserActivity extends MorphActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
mSwipeRefreshLayout.setRefreshing(false);
mLoading = false;
Snackbar.make(mRoot, getString(R.string.connection_error_users), Snackbar.LENGTH_SHORT)
@@ -211,7 +211,7 @@ public class AddUserActivity extends MorphActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
mAdapter.setLoading(false);
}
};
@@ -228,7 +228,7 @@ public class AddUserActivity extends MorphActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
if (t instanceof HttpException) {
//Conflict
if (((HttpException) t).response().code() == 409) {
app/src/main/java/com/commit451/gitlab/activity/BuildActivity.java
+ 3
− 3
View file @ 1bc6730c
@@ -77,7 +77,7 @@ public class BuildActivity extends BaseActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
mProgress.setVisibility(View.GONE);
Snackbar.make(mRoot, R.string.unable_to_retry_build, Snackbar.LENGTH_LONG)
.show();
@@ -95,7 +95,7 @@ public class BuildActivity extends BaseActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
mProgress.setVisibility(View.GONE);
Snackbar.make(mRoot, R.string.unable_to_erase_build, Snackbar.LENGTH_LONG)
.show();
@@ -113,7 +113,7 @@ public class BuildActivity extends BaseActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
mProgress.setVisibility(View.GONE);
Snackbar.make(mRoot, R.string.unable_to_cancel_build, Snackbar.LENGTH_LONG)
.show();
app/src/main/java/com/commit451/gitlab/activity/DiffActivity.java
+ 1
− 1
View file @ 1bc6730c
@@ -64,7 +64,7 @@ public class DiffActivity extends BaseActivity {
@Override
public void failure(Throwable t) {
mSwipeRefreshLayout.setRefreshing(false);
Timber.e(t, null);
Timber.e(t);
mMessageText.setText(R.string.connection_error);
mMessageText.setVisibility(View.VISIBLE);
}
app/src/main/java/com/commit451/gitlab/activity/FileActivity.java
+ 4
− 4
View file @ 1bc6730c
@@ -87,7 +87,7 @@ public class FileActivity extends BaseActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
mProgressView.setVisibility(View.GONE);
Snackbar.make(mRoot, R.string.file_load_error, Snackbar.LENGTH_SHORT)
.show();
@@ -256,7 +256,7 @@ public class FileActivity extends BaseActivity {
 
return targetFile;
} catch (IOException e) {
Timber.e(e, null);
Timber.e(e);
Snackbar.make(mRoot, getString(R.string.save_error), Snackbar.LENGTH_SHORT)
.show();
} finally {
@@ -264,7 +264,7 @@ public class FileActivity extends BaseActivity {
try {
outputStream.close();
} catch (IOException e) {
Timber.e(e, null);
Timber.e(e);
}
}
}
@@ -296,7 +296,7 @@ public class FileActivity extends BaseActivity {
try {
startActivity(intent);
} catch (ActivityNotFoundException | SecurityException e) {
Timber.e(e, null);
Timber.e(e);
Snackbar.make(mRoot, getString(R.string.open_error), Snackbar.LENGTH_SHORT)
.show();
}
app/src/main/java/com/commit451/gitlab/activity/GroupActivity.java
+ 1
− 1
View file @ 1bc6730c
@@ -70,7 +70,7 @@ public class GroupActivity extends BaseActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
mProgress.setVisibility(View.GONE);
showError();
}
app/src/main/java/com/commit451/gitlab/activity/GroupsActivity.java
+ 2
− 2
View file @ 1bc6730c
@@ -86,7 +86,7 @@ public class GroupsActivity extends BaseActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
mSwipeRefreshLayout.setRefreshing(false);
mLoading = false;
mMessageText.setVisibility(View.VISIBLE);
@@ -104,7 +104,7 @@ public class GroupsActivity extends BaseActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
mLoading = false;
}
};
app/src/main/java/com/commit451/gitlab/activity/IssueActivity.java
+ 7
− 22
View file @ 1bc6730c
@@ -141,7 +141,7 @@ public class IssueActivity extends BaseActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
mSwipeRefreshLayout.setRefreshing(false);
Snackbar.make(mRoot, getString(R.string.failed_to_load), Snackbar.LENGTH_SHORT)
.show();
@@ -168,7 +168,7 @@ public class IssueActivity extends BaseActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
mSwipeRefreshLayout.setRefreshing(false);
Snackbar.make(mRoot, getString(R.string.failed_to_load), Snackbar.LENGTH_SHORT)
.show();
@@ -188,7 +188,7 @@ public class IssueActivity extends BaseActivity {
@Override
public void failure(Throwable t) {
mLoading = false;
Timber.e(t, null);
Timber.e(t);
mSwipeRefreshLayout.setRefreshing(false);
Snackbar.make(mRoot, getString(R.string.connection_error), Snackbar.LENGTH_SHORT)
.show();
@@ -208,7 +208,7 @@ public class IssueActivity extends BaseActivity {
@Override
public void failure(Throwable t) {
mLoading = false;
Timber.e(t, null);
Timber.e(t);
mIssueDetailsAdapter.setLoading(false);
}
};
@@ -226,7 +226,7 @@ public class IssueActivity extends BaseActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
mProgress.setVisibility(View.GONE);
Snackbar.make(mRoot, getString(R.string.error_changing_issue), Snackbar.LENGTH_SHORT)
.show();
@@ -244,22 +244,7 @@ public class IssueActivity extends BaseActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
mProgress.setVisibility(View.GONE);
Snackbar.make(mRoot, getString(R.string.connection_error), Snackbar.LENGTH_SHORT)
.show();
}
};
private Callback<FileUploadResponse> mUploadImageCallback = new EasyCallback<FileUploadResponse>() {
@Override
public void success(@NonNull FileUploadResponse response) {
}
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
mProgress.setVisibility(View.GONE);
Snackbar.make(mRoot, getString(R.string.connection_error), Snackbar.LENGTH_SHORT)
.show();
@@ -277,7 +262,7 @@ public class IssueActivity extends BaseActivity {
 
@Override
public void onFailure(Call<Void> call, Throwable t) {
Timber.e(t, null);
Timber.e(t);
Snackbar.make(mRoot, getString(R.string.failed_to_delete_issue), Snackbar.LENGTH_SHORT)
.show();
}
app/src/main/java/com/commit451/gitlab/activity/LoadSomeInfoActivity.java
+ 5
− 5
View file @ 1bc6730c
@@ -118,7 +118,7 @@ public class LoadSomeInfoActivity extends AppCompatActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
onError();
}
};
@@ -132,7 +132,7 @@ public class LoadSomeInfoActivity extends AppCompatActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
onError();
}
};
@@ -150,7 +150,7 @@ public class LoadSomeInfoActivity extends AppCompatActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
onError();
}
};
@@ -164,7 +164,7 @@ public class LoadSomeInfoActivity extends AppCompatActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
onError();
}
};
@@ -182,7 +182,7 @@ public class LoadSomeInfoActivity extends AppCompatActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
onError();
}
};
app/src/main/java/com/commit451/gitlab/activity/LoginActivity.java
+ 4
− 4
View file @ 1bc6730c
@@ -148,7 +148,7 @@ public class LoginActivity extends BaseActivity {
 
@Override
public void onFailure(Call<UserLogin> call, Throwable t) {
Timber.e(t, null);
Timber.e(t);
handleConnectionError(t);
}
};
@@ -175,7 +175,7 @@ public class LoginActivity extends BaseActivity {
 
@Override
public void onFailure(Call<UserFull> call, Throwable t) {
Timber.e(t, null);
Timber.e(t);
handleConnectionError(t);
}
};
@@ -399,7 +399,7 @@ public class LoginActivity extends BaseActivity {
uri = Uri.parse(url);
}
} catch (Exception e) {
Timber.e(e, null);
Timber.e(e);
}
 
if (uri == null) {
@@ -454,7 +454,7 @@ public class LoginActivity extends BaseActivity {
try {
fingerprint = X509Util.getFingerPrint(((X509CertificateException) t.getCause()).getChain()[0]);
} catch (CertificateEncodingException e) {
Timber.e(e, null);
Timber.e(e);
}
final String finalFingerprint = fingerprint;
 
app/src/main/java/com/commit451/gitlab/activity/MergeRequestActivity.java
+ 1
− 1
View file @ 1bc6730c
@@ -67,7 +67,7 @@ public class MergeRequestActivity extends BaseActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
mProgress.setVisibility(View.GONE);
String message = getString(R.string.unable_to_merge);
if (t instanceof HttpException) {
app/src/main/java/com/commit451/gitlab/activity/MilestoneActivity.java
+ 3
− 3
View file @ 1bc6730c
@@ -104,7 +104,7 @@ public class MilestoneActivity extends BaseActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
mLoading = false;
mSwipeRefreshLayout.setRefreshing(false);
mMessageText.setVisibility(View.VISIBLE);
@@ -123,7 +123,7 @@ public class MilestoneActivity extends BaseActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
mLoading = false;
}
};
@@ -139,7 +139,7 @@ public class MilestoneActivity extends BaseActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
mProgress.setVisibility(View.GONE);
Snackbar.make(mRoot, getString(R.string.failed_to_create_milestone), Snackbar.LENGTH_SHORT)
.show();
app/src/main/java/com/commit451/gitlab/activity/ProjectActivity.java
+ 1
− 1
View file @ 1bc6730c
@@ -88,7 +88,7 @@ public class ProjectActivity extends BaseActivity {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
mProgress.animate()
.alpha(0.0f)
.withEndAction(new HideRunnable(mProgress));
app/src/main/java/com/commit451/gitlab/dialog/AccessDialog.java
+ 1
− 1
View file @ 1bc6730c
@@ -62,7 +62,7 @@ public class AccessDialog extends MaterialDialog {
 
@Override
public void failure(Throwable t) {
Timber.e(t, null);
Timber.e(t);
onError();
}
};
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment