diff --git a/media/android/NewsBlur/src/com/newsblur/fragment/LoginProgressFragment.java b/media/android/NewsBlur/src/com/newsblur/fragment/LoginProgressFragment.java index 8ac03512b..d3f15f2c7 100644 --- a/media/android/NewsBlur/src/com/newsblur/fragment/LoginProgressFragment.java +++ b/media/android/NewsBlur/src/com/newsblur/fragment/LoginProgressFragment.java @@ -27,13 +27,11 @@ import com.newsblur.service.SyncService; import com.newsblur.util.PrefsUtils; import com.newsblur.util.UIUtils; -public class LoginProgressFragment extends Fragment /*implements Receiver*/ { +public class LoginProgressFragment extends Fragment { private APIManager apiManager; - //private DetachableResultReceiver receiver; private TextView updateStatus, retrievingFeeds, letsGo; private ImageView loginProfilePicture; - //private int CURRENT_STATUS = -1; private ProgressBar feedProgress, loggingInProgress; private LoginTask loginTask; private String username; @@ -53,8 +51,6 @@ public class LoginProgressFragment extends Fragment /*implements Receiver*/ { super.onCreate(savedInstanceState); setRetainInstance(true); apiManager = new APIManager(getActivity()); - //receiver = new DetachableResultReceiver(new Handler()); - //receiver.setReceiver(this); username = getArguments().getString("username"); password = getArguments().getString("password"); @@ -70,14 +66,9 @@ public class LoginProgressFragment extends Fragment /*implements Receiver*/ { feedProgress = (ProgressBar) v.findViewById(R.id.login_feed_progress); loggingInProgress = (ProgressBar) v.findViewById(R.id.login_logging_in_progress); loginProfilePicture = (ImageView) v.findViewById(R.id.login_profile_picture); - // password.setOnEditorActionListener(this); - if (loginTask != null) { - //refreshUI(); - } else { - loginTask = new LoginTask(); - loginTask.execute(); - } + loginTask = new LoginTask(); + loginTask.execute(); return v; } @@ -121,11 +112,6 @@ public class LoginProgressFragment extends Fragment /*implements Receiver*/ { retrievingFeeds.setText(R.string.login_retrieving_feeds); retrievingFeeds.startAnimation(b); - /*final Intent intent = new Intent(Intent.ACTION_SYNC, null, getActivity(), SyncService.class); - intent.putExtra(SyncService.EXTRA_STATUS_RECEIVER, receiver); - intent.putExtra(SyncService.SYNCSERVICE_TASK, SyncService.EXTRA_TASK_FOLDER_UPDATE); - getActivity().startService(intent);*/ - Intent startMain = new Intent(getActivity(), Main.class); getActivity().startActivity(startMain); @@ -140,55 +126,4 @@ public class LoginProgressFragment extends Fragment /*implements Receiver*/ { } } - - /*private void refreshUI() { - switch (CURRENT_STATUS) { - case SyncService.NOT_RUNNING: - break; - case SyncService.STATUS_NO_MORE_UPDATES: - break; - case SyncService.STATUS_FINISHED: - final Animation b = AnimationUtils.loadAnimation(getActivity(), R.anim.text_down); - retrievingFeeds.setText(R.string.login_retrieved_feeds); - retrievingFeeds.startAnimation(b); - - final Animation c = AnimationUtils.loadAnimation(getActivity(), R.anim.text_up); - letsGo.setText(R.string.login_lets_go); - c.setAnimationListener(new AnimationListener() { - @Override - public void onAnimationEnd(Animation animation) { - Intent startMain = new Intent(getActivity(), Main.class); - getActivity().startActivity(startMain); - } - - @Override - public void onAnimationRepeat(Animation animation) { } - - @Override - public void onAnimationStart(Animation animation) { } - }); - letsGo.startAnimation(c); - break; - case SyncService.STATUS_RUNNING: - break; - case SyncService.STATUS_ERROR: - updateStatus.setText("Error synchronising."); - break; - } - }*/ - - - // Interface for Host - /*public interface LoginFragmentInterface { - public void loginSuccessful(); - public void loginUnsuccessful(); - public void syncSuccessful(); - }*/ - - /*@Override - public void onReceiverResult(int resultCode, Bundle resultData) { - CURRENT_STATUS = resultCode; - refreshUI(); - }*/ - }