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

fix various crashes

Browse source
This commit is contained in:
Phillip Thelen 2017-05-22 13:05:35 +02:00
parent 889ec32323
commit c62227fc97
4 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
View file

@ -145,12 +145,8 @@ public abstract class HabiticaBaseApplication extends MultiDexApplication {
protected void setupRealm() {
Realm.init(this);
RealmConfiguration.Builder builder = new RealmConfiguration.Builder()
.schemaVersion(1);
if (BuildConfig.DEBUG) {
builder = builder.deleteRealmIfMigrationNeeded();
}
Fresco.initialize(this);
.schemaVersion(1)
.deleteRealmIfMigrationNeeded();
Realm.setDefaultConfiguration(builder.build());
}

4
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/CreateChallengeActivity.java
View file

@ -355,7 +355,9 @@ public class CreateChallengeActivity extends BaseActivity {
locationAdapter.add(tavern);
groups.forEach(group -> locationAdapter.add(group));
for (Group group : groups) {
locationAdapter.add(group);
}
}, RxErrorHandler.handleEmptyError());
challengeLocationSpinner.setAdapter(locationAdapter);

24
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/LoginActivity.java
View file

@ -47,6 +47,8 @@ import com.google.android.gms.auth.GoogleAuthUtil;
import com.google.android.gms.auth.GooglePlayServicesAvailabilityException;
import com.google.android.gms.auth.UserRecoverableAuthException;
import com.google.android.gms.common.AccountPicker;
import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.GoogleApiAvailability;
import com.google.android.gms.common.GooglePlayServicesUtil;
import com.google.android.gms.common.Scopes;
import com.habitrpg.android.habitica.BuildConfig;
@ -91,7 +93,7 @@ public class LoginActivity extends BaseActivity
private final static String TAG_USERID = "user";
private final static String TAG_APIKEY = "key";
private static final int REQUEST_CODE_RECOVER_FROM_PLAY_SERVICES_ERROR = 1001;
private final static int PLAY_SERVICES_RESOLUTION_REQUEST = 9000;
@Inject
public ApiClient apiClient;
@ -461,6 +463,9 @@ public class LoginActivity extends BaseActivity
@OnClick(R.id.google_login_button)
public void handleGoogleLogin() {
if (!checkPlayServices()) {
return;
}
String[] accountTypes = new String[]{"com.google"};
Intent intent = AccountPicker.newChooseAccountIntent(null, null,
accountTypes, false, null, null, null, null);
@ -504,6 +509,7 @@ public class LoginActivity extends BaseActivity
// the user to update the APK
int statusCode = ((GooglePlayServicesAvailabilityException) e)
.getConnectionStatusCode();
GoogleApiAvailability googleAPI = GoogleApiAvailability.getInstance();
Dialog dialog = GooglePlayServicesUtil.getErrorDialog(statusCode,
LoginActivity.this,
REQUEST_CODE_RECOVER_FROM_PLAY_SERVICES_ERROR);
@ -513,11 +519,23 @@ public class LoginActivity extends BaseActivity
// the app access to the account, but the user can fix this.
// Forward the user to an activity in Google Play services.
Intent intent = ((UserRecoverableAuthException) e).getIntent();
startActivityForResult(intent,
REQUEST_CODE_RECOVER_FROM_PLAY_SERVICES_ERROR);
startActivityForResult(intent, REQUEST_CODE_RECOVER_FROM_PLAY_SERVICES_ERROR);
}
}
private boolean checkPlayServices() {
GoogleApiAvailability googleAPI = GoogleApiAvailability.getInstance();
int result = googleAPI.isGooglePlayServicesAvailable(this);
if(result != ConnectionResult.SUCCESS) {
if(googleAPI.isUserResolvableError(result)) {
googleAPI.getErrorDialog(this, result, PLAY_SERVICES_RESOLUTION_REQUEST).show();
}
return false;
}
return true;
}
@OnClick(R.id.new_game_button)
void newGameButtonClicked() {
isRegistering = true;

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java
View file

@ -172,7 +172,7 @@ public class TasksFragment extends BaseMainFragment {
private void showFilterDialog() {
TaskFilterDialog dialog = new TaskFilterDialog(getContext(), HabiticaBaseApplication.getComponent());
if (user != null) {
dialog.setTags(user.getTags());
dialog.setTags(user.getTags().createSnapshot());
}
dialog.setActiveTags(taskFilterHelper.getTags());
if (getActiveFragment() != null) {