sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-07-13 17:51:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix minor issues

Browse source
This commit is contained in:
Phillip Thelen 2017-07-21 14:14:06 +02:00
parent 012a2d8f56
commit bddb7a7a11
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Habitica/AndroidManifest.xml
View file

@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.habitrpg.android.habitica" package="com.habitrpg.android.habitica"
android:versionCode="1920" android:versionCode="1921"
android:versionName="1.1.5" android:versionName="1.1.5"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:installLocation="auto" > android:installLocation="auto" >

2
Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TagRepositoryImpl.java
View file

@ -41,7 +41,7 @@ public class TagRepositoryImpl extends BaseRepositoryImpl<TagLocalRepository> im
@Override @Override
public Observable<Tag> createTags(Collection<Tag> tags) { public Observable<Tag> createTags(Collection<Tag> tags) {
return Observable.defer(() -> Observable.from(tags)) return Observable.defer(() -> Observable.from(tags))
.filter(tag -> !tag.getName().isEmpty()) .filter(tag -> tag.getName() != null && !tag.getName().isEmpty())
.flatMap(this::createTag); .flatMap(this::createTag);
} }

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
View file

@ -311,7 +311,7 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
btnDelete.setOnClickListener(view -> new AlertDialog.Builder(view.getContext()) btnDelete.setOnClickListener(view -> new AlertDialog.Builder(view.getContext())
.setTitle(getString(R.string.taskform_delete_title)) .setTitle(getString(R.string.taskform_delete_title))
.setMessage(getString(R.string.taskform_delete_message)).setPositiveButton(getString(R.string.yes), (dialog, which) -> { .setMessage(getString(R.string.taskform_delete_message)).setPositiveButton(getString(R.string.yes), (dialog, which) -> {
if (task != null) { if (task != null && task.isValid()) {
taskRepository.deleteTask(task.getId()); taskRepository.deleteTask(task.getId());
} }