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

fix minor bugs

Browse source
This commit is contained in:
Phillip Thelen 2017-07-05 19:49:11 +02:00
parent c0f62c4d66
commit e390abc3bb
3 changed files with 7 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"
xmlns:tools="http://schemas.android.com/tools"
package="com.habitrpg.android.habitica"
android:versionCode="1903"
android:versionCode="1904"
android:versionName="1.1"
android:screenOrientation="portrait"
android:installLocation="auto" >

6
Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmBaseLocalRepository.java
View file

@ -28,7 +28,11 @@ abstract class RealmBaseLocalRepository implements BaseLocalRepository {
@Override
public <T extends RealmObject> T getUnmanagedCopy(T object) {
return realm.copyFromRealm(object);
if (object.isManaged() && object.isValid()) {
return realm.copyFromRealm(object);
} else {
return object;
}
}
@Override

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

@ -124,7 +124,7 @@ public class ChallengeDetailActivity extends BaseActivity {
MenuInflater inflater = getMenuInflater();
inflater.inflate(R.menu.menu_challenge_details, menu);
if(challenge != null && !challenge.leaderId.equals(userId)){
if(challenge != null && challenge.leaderId != null && !challenge.leaderId.equals(userId)){
menu.setGroupVisible(R.id.challenge_edit_action_group, false);
}