Skip to content

Fix merge that left CommCareSetupActivity with two onDestroy methods #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
amstone326 merged 1 commit into from
Jul 30, 2014
Merged

Fix merge that left CommCareSetupActivity with two onDestroy methods #6

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions app/src/org/commcare/dalvik/activities/CommCareSetupActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,6 @@ public enum UiState { advanced, basic, ready, error, upgrade};

boolean partialMode = false;

BroadcastReceiver mBroadcastReceiver;

CommCareApp ccApp;

//Whether this needs to be interactive (if it's automatic, we want to skip a lot of the UI stuff
Expand Down Expand Up @@ -355,6 +353,7 @@ public void onGlobalLayout() {

@Override
public void onDestroy() {
super.onDestroy();
if (purgeNotificationReceiver != null) {
unregisterReceiver(purgeNotificationReceiver);
}
Expand Down Expand Up @@ -644,12 +643,6 @@ protected void deliverError(CommCareSetupActivity receiver, Exception e) {
Log.i("commcare-install", "Blocked a resource install press since a task was already running");
}
}

@Override
public void onDestroy() {
super.onDestroy();
unregisterReceiver(this.mBroadcastReceiver);
}

@Override
public boolean onCreateOptionsMenu(Menu menu) {
Expand Down