diff --git a/android/src/com/parse/f8/view/ScheduleActivity.java b/android/src/com/parse/f8/view/ScheduleActivity.java index bc6a738..9e6944b 100644 --- a/android/src/com/parse/f8/view/ScheduleActivity.java +++ b/android/src/com/parse/f8/view/ScheduleActivity.java @@ -40,6 +40,7 @@ public class ScheduleActivity extends BaseActivity implements ActionBar.TabListener { + private static ScheduleActivity instance; private ScheduleSectionsPagerAdapter scheduleSectionsPagerAdapter; private ViewPager sectionsViewPager; private ActionBar actionBar; @@ -81,6 +82,8 @@ public void onPageSelected(int position) { actionBar.addTab(scheduleTab); } + instance = this; + } public static class ScheduleSectionsPagerAdapter extends @@ -161,4 +164,8 @@ public void onTabUnselected(Tab arg0, FragmentTransaction arg1) { } } + public static ScheduleActivity getInstance() { + return instance; + } + } diff --git a/android/src/com/parse/f8/view/ScheduleFragment.java b/android/src/com/parse/f8/view/ScheduleFragment.java index 4dd09e3..4d75e23 100644 --- a/android/src/com/parse/f8/view/ScheduleFragment.java +++ b/android/src/com/parse/f8/view/ScheduleFragment.java @@ -23,9 +23,6 @@ package com.parse.f8.view; -import java.util.ArrayList; -import java.util.List; - import android.content.Intent; import android.os.Bundle; import android.support.v4.app.Fragment; @@ -46,8 +43,10 @@ import com.parse.f8.model.Talk; import com.parse.f8.util.TalkListAdapter; -public class ScheduleFragment extends Fragment { +import java.util.ArrayList; +import java.util.List; +public class ScheduleFragment extends Fragment { public static final String ARG_TRACK = "track"; public String[] scheduleTitles; @@ -93,7 +92,8 @@ public void onCreate(Bundle savedInstanceState) { public void done(Talk talk, ParseException e) { if (talk != null) { talkList.add(talk); - if (!getActivity().isFinishing()) { + + if (!ScheduleActivity.getInstance().isFinishing()) { // Update view updateView(); } @@ -102,7 +102,7 @@ public void done(Talk talk, ParseException e) { }); } else { // This is a list of talks for a track - adapter = new TalkListAdapter(getActivity(), false); + adapter = new TalkListAdapter(ScheduleActivity.getInstance(), false); // Get the room info corresponding to this track Room.findInBackground(track, new GetCallback() { @Override @@ -119,7 +119,7 @@ public void done(List talks, ParseException e) { adapter.add(talk); } } - if (!getActivity().isFinishing()) { + if (!ScheduleActivity.getInstance().isFinishing()) { // Update view updateView(); } @@ -167,7 +167,7 @@ public void onItemClick(AdapterView parent, View view, // 1 Talk talk = adapter.getItem(position - 1); if (!talk.isBreak()) { - Intent intent = new Intent(getActivity(), + Intent intent = new Intent(ScheduleActivity.getInstance(), TalkActivity.class); intent.setData(talk.getUri()); startActivity(intent);