public-mirrors/NewsBlur-viq
1
0
Fork 0
mirror of https://github.com/viq/NewsBlur.git synced 2025-09-18 21:43:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed crash due to misplaced network call on main thread

Browse source
This commit is contained in:
RyanBateman 2012-10-01 15:21:44 -04:00
parent 1937996503
commit 7b2937dfe5
2 changed files with 20 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
media/android/NewsBlur/res/layout/fragment_registerprogress.xml
View file

@ -55,7 +55,7 @@
android:layout_marginTop="20dp"
android:gravity="center"
android:text="@string/faster_faster"
android:textColor="@color/darkgray"
android:textColor="@color/white"
android:textSize="18sp" />
</LinearLayout>
@ -65,8 +65,6 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_marginBottom="20dp"
android:layout_marginRight="20dp"
android:text="@string/login_lets_go"
android:textSize="20sp" />
</RelativeLayout>

39
media/android/NewsBlur/src/com/newsblur/fragment/LoginProgressFragment.java
View file

@ -47,10 +47,10 @@ public class LoginProgressFragment extends Fragment implements Receiver {
bundle.putString("password", password);
fragment.setArguments(bundle);
return fragment;
}
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@ -59,16 +59,16 @@ public class LoginProgressFragment extends Fragment implements Receiver {
receiver = new DetachableResultReceiver(new Handler());
receiver.setReceiver(this);
Log.d(TAG , "Creating new fragment instance");
username = getArguments().getString("username");
password = getArguments().getString("password");
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View v = inflater.inflate(R.layout.fragment_loginprogress, null);
updateStatus = (TextView) v.findViewById(R.id.login_logging_in);
retrievingFeeds = (TextView) v.findViewById(R.id.login_retrieving_feeds);
letsGo = (TextView) v.findViewById(R.id.login_lets_go);
@ -76,17 +76,17 @@ public class LoginProgressFragment extends Fragment implements Receiver {
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();
}
return v;
}
private class LoginTask extends AsyncTask<String, Void, LoginResponse> {
private static final String TAG = "LoginTask";
@ -100,7 +100,7 @@ public class LoginProgressFragment extends Fragment implements Receiver {
@Override
protected LoginResponse doInBackground(String... params) {
LoginResponse response = apiManager.login(username, password);
apiManager.updateUserProfile();
try {
// We include this wait simply as a small UX convenience. Otherwise the user could be met with a disconcerting flicker when attempting to log in and failing.
Thread.sleep(700);
@ -113,16 +113,15 @@ public class LoginProgressFragment extends Fragment implements Receiver {
@Override
protected void onPostExecute(LoginResponse result) {
if (result.authenticated) {
apiManager.updateUserProfile();
final Animation a = AnimationUtils.loadAnimation(getActivity(), R.anim.text_down);
updateStatus.setText(R.string.login_logged_in);
loggingInProgress.setVisibility(View.GONE);
updateStatus.startAnimation(a);
loginProfilePicture.setVisibility(View.VISIBLE);
loginProfilePicture.setImageBitmap(UIUtils.roundCorners(PrefsUtils.getUserImage(getActivity()), 10f));
feedProgress.setVisibility(View.VISIBLE);
final Animation b = AnimationUtils.loadAnimation(getActivity(), R.anim.text_up);
retrievingFeeds.setText(R.string.login_retrieving_feeds);
retrievingFeeds.startAnimation(b);
@ -133,14 +132,14 @@ public class LoginProgressFragment extends Fragment implements Receiver {
getActivity().startService(intent);
} else {
if (result.errors != null && result.errors.message != null) {
Toast.makeText(getActivity(), result.errors.message[0], Toast.LENGTH_LONG).show();
} else {
Toast.makeText(getActivity(), getResources().getString(R.string.login_message_error), Toast.LENGTH_LONG).show();
}
Toast.makeText(getActivity(), result.errors.message[0], Toast.LENGTH_LONG).show();
} else {
Toast.makeText(getActivity(), getResources().getString(R.string.login_message_error), Toast.LENGTH_LONG).show();
}
getActivity().finish();
}
}
}
private void refreshUI() {
@ -177,7 +176,7 @@ public class LoginProgressFragment extends Fragment implements Receiver {
break;
}
}
// Interface for Host
public interface LoginFragmentInterface {
@ -192,5 +191,5 @@ public class LoginProgressFragment extends Fragment implements Receiver {
CURRENT_STATUS = resultCode;
refreshUI();
}
}