[MediaWiki-commits] [Gerrit] Make sure sidebar says log in only if user is logged out - change (apps...wikipedia)

[Brion VIBBER (Code Review)]

Brion VIBBER has submitted this change and it was merged.

Change subject: Make sure sidebar says log in only if user is logged out
......................................................................


Make sure sidebar says log in only if user is logged out

Change-Id: I1e5d944086edeee98b407f7a8178e9866ed5bc3c
---
M wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
M wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java
2 files changed, 11 insertions(+), 26 deletions(-)

Approvals:
  Brion VIBBER: Verified; Looks good to me, approved



diff --git a/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java 
b/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
index 9e23483..0cb4a8b 100644
--- a/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java
@@ -2,10 +2,8 @@
 
 import android.app.*;
 import android.content.*;
+import android.graphics.*;
 import android.os.*;
-import android.content.Intent;
-import android.graphics.Color;
-import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.*;
 import android.widget.*;
@@ -13,7 +11,6 @@
 import org.wikipedia.login.*;
 import org.wikipedia.savedpages.*;
 import org.wikipedia.settings.*;
-import org.wikipedia.WikipediaApp;
 
 public class NavDrawerFragment extends Fragment implements 
AdapterView.OnItemClickListener {
     private static final int[] ACTION_ITEMS_TEXT = {
@@ -40,13 +37,20 @@
     }
 
     @Override
+    public void onResume() {
+        super.onResume();
+
+        // Ensure that Login / Logout status is accurate
+        setupDynamicItems();
+        ((NavListAdapter)navList.getAdapter()).notifyDataSetChanged();
+    }
+
+    @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
         navList = (ListView) getView().findViewById(R.id.nav_list);
         adapter = new NavListAdapter();
         app = (WikipediaApp)getActivity().getApplicationContext();
-
-        setupDynamicItems();
 
         navList.setAdapter(adapter);
         navList.setOnItemClickListener(this);
@@ -70,7 +74,7 @@
                 break;
             case R.string.nav_item_login:
                 intent.setClass(this.getActivity(), LoginActivity.class);
-                startActivityForResult(intent, 
LoginActivity.REQUEST_CODE_LOGIN);
+                startActivity(intent);
                 break;
             case R.string.nav_item_logout:
                 doLogout();
@@ -79,22 +83,6 @@
                 return;
             default:
                 throw new RuntimeException("Unknown ID clicked!");
-        }
-    }
-
-    @Override
-    public void onActivityResult(int requestCode, int resultCode, Intent data) 
{
-        // Okay, so this is really, really stupid, but
-        // sometimes if the previous activity was destroyed before the 
callback is done
-        // onActivityResult may be called *before* the onCreate, 
onActivityAttach, etc are called
-        // This, of course, is fucking stupid. However, in this particular 
case (updating the login status)
-        // we can just ignore it if that is the case and keep going.
-        // BUGS! GRR!
-        if (getView() != null) {
-            if (resultCode == LoginActivity.LOG_IN_SUCCESSFUL) {
-                setupDynamicItems();
-                ((NavListAdapter)navList.getAdapter()).notifyDataSetChanged();
-            }
         }
     }
 
diff --git a/wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java 
b/wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java
index a10e6da..40f41d9 100644
--- a/wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/login/LoginActivity.java
@@ -13,8 +13,6 @@
 import org.wikipedia.createaccount.*;
 
 public class LoginActivity extends ActionBarActivity {
-    public static final int REQUEST_CODE_LOGIN = 1;
-    public static final int LOG_IN_SUCCESSFUL = 1;
     private EditText usernameText;
     private EditText passwordText;
     private CheckBox showPassword;
@@ -99,7 +97,6 @@
                 progressDialog.dismiss();
                 if (result.equals("Success")) {
                     Toast.makeText(LoginActivity.this, 
R.string.login_success_toast, Toast.LENGTH_LONG).show();
-                    setResult(LOG_IN_SUCCESSFUL);
 
                     Utils.hideSoftKeyboard(LoginActivity.this);
 

-- 
To view, visit https://gerrit.wikimedia.org/r/115873
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I1e5d944086edeee98b407f7a8178e9866ed5bc3c
Gerrit-PatchSet: 3
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits