Skip to content
Snippets Groups Projects
Commit 64de2852 authored by Jawnnypoo's avatar Jawnnypoo
Browse files

Fix some silly crashes

parent 2005170f
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -60,19 +60,19 @@ dependencies {
exclude group: 'stax', module: 'stax-api'
exclude group: 'stax', module: 'stax'
}
compile 'com.squareup.okhttp3:okhttp:3.3.1'
compile 'com.squareup.okhttp3:logging-interceptor:3.3.1'
compile 'com.squareup.okhttp3:okhttp:3.4.1'
compile 'com.squareup.okhttp3:logging-interceptor:3.4.1'
compile 'com.squareup.picasso:picasso:2.5.2'
compile 'com.jakewharton.picasso:picasso2-okhttp3-downloader:1.0.2'
compile 'com.squareup:otto:1.3.8'
compile 'io.reactivex:rxjava:1.1.6'
compile 'io.reactivex:rxjava:1.1.7'
compile 'io.reactivex:rxandroid:1.2.1'
compile 'com.jakewharton:butterknife:8.1.0'
apt 'com.jakewharton:butterknife-compiler:8.1.0'
compile 'com.jakewharton:butterknife:8.2.0'
apt 'com.jakewharton:butterknife-compiler:8.2.0'
compile 'com.jakewharton.timber:timber:4.1.2'
apt 'com.bluelinelabs:logansquare-compiler:1.3.7'
compile 'com.bluelinelabs:logansquare:1.3.7'
compile 'net.danlew:android.joda:2.9.3.1'
compile 'net.danlew:android.joda:2.9.4.1'
compile 'org.parceler:parceler-api:1.1.5'
apt 'org.parceler:parceler:1.1.5'
compile 'com.commit451:bypasses:1.0.1'
Loading
Loading
Loading
Loading
@@ -7,6 +7,7 @@ import android.widget.Toast;
 
import com.afollestad.materialdialogs.DialogAction;
import com.afollestad.materialdialogs.MaterialDialog;
import com.afollestad.materialdialogs.Theme;
import com.commit451.gitlab.R;
import com.commit451.easycallback.EasyCallback;
import com.commit451.gitlab.api.GitLabClient;
Loading
Loading
@@ -24,6 +25,11 @@ import timber.log.Timber;
public class AccessDialog extends MaterialDialog {
 
void onApply() {
if (getSelectedIndex() == -1) {
Toast.makeText(getContext(), R.string.please_select_access_level, Toast.LENGTH_LONG)
.show();
return;
}
String accessLevel = mRoleNames[getSelectedIndex()];
if (accessLevel == null) {
Toast.makeText(getContext(), R.string.please_select_access_level, Toast.LENGTH_LONG)
Loading
Loading
@@ -83,6 +89,7 @@ public class AccessDialog extends MaterialDialog {
return true;
}
})
.theme(Theme.DARK)
.progress(true, 0) // So we can later show loading progress
.positiveText(R.string.action_apply)
.negativeText(R.string.md_cancel_label));
Loading
Loading
Loading
Loading
@@ -46,6 +46,10 @@ public class CommitViewHolder extends RecyclerView.ViewHolder {
 
mMessageView.setText(commit.getTitle());
mAuthorView.setText(commit.getAuthorName());
mTimeView.setText(DateUtils.getRelativeTimeSpanString(itemView.getContext(), commit.getCreatedAt()));
if (commit.getCreatedAt() != null) {
mTimeView.setText(DateUtils.getRelativeTimeSpanString(itemView.getContext(), commit.getCreatedAt()));
} else {
mTimeView.setText(R.string.unknown);
}
}
}
<?xml version="1.0" encoding="utf-8"?>
<resources>
 
<!-- General -->
<string name="app_name">LabCoat</string>
<string name="unknown">Unknown</string>
 
<!-- Drawer -->
<string name="nav_projects">Projects</string>
Loading
Loading
Loading
Loading
@@ -9,7 +9,7 @@ buildscript {
classpath 'com.android.tools.build:gradle:2.1.2'
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
//check with ./gradlew dependencyUpdates
classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0'
classpath 'io.fabric.tools:gradle:1.21.7'
}
}
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment