From 3b1de98a41e67ad18c90bb10d6c8569ec612a543 Mon Sep 17 00:00:00 2001 From: Denis Babani Date: Fri, 7 Feb 2014 14:58:41 -0500 Subject: [PATCH 1/9] reverting a change --- .../shuttles/MITRoutesSliderActivity.java | 47 ++++++++++--------- 1 file changed, 26 insertions(+), 21 deletions(-) diff --git a/src/edu/mit/mitmobile2/shuttles/MITRoutesSliderActivity.java b/src/edu/mit/mitmobile2/shuttles/MITRoutesSliderActivity.java index 53a019299..bbe1f21f6 100644 --- a/src/edu/mit/mitmobile2/shuttles/MITRoutesSliderActivity.java +++ b/src/edu/mit/mitmobile2/shuttles/MITRoutesSliderActivity.java @@ -16,10 +16,10 @@ public class MITRoutesSliderActivity extends SliderListNewModuleActivity { private static final String TAG = "MITRoutesSliderActivity"; - - private int selectedPos; - private int startPos; + private static RoutesAsyncListView curView; + private int position; + static final String KEY_POSITION = "key_position"; static final String NOT_RUNNING = "Bus not running. Following schedule."; static final String GPS_ONLINE = "Real time bus tracking online."; @@ -39,8 +39,7 @@ public void onCreate(Bundle savedInstanceState) { } Bundle bundle = getIntent().getExtras(); if (null != bundle) { - startPos = bundle.getInt(KEY_POSITION, 0); - selectedPos = startPos; + position = bundle.getInt(KEY_POSITION, 0); } createViews(); @@ -48,22 +47,30 @@ public void onCreate(Bundle savedInstanceState) { /****************************************************/ @Override protected void onPause() { - RoutesAsyncListView oldView = (RoutesAsyncListView) getScreen(selectedPos); - oldView.terminate(); + for (int x=0; x < ShuttleModel.getSortedRoutes().size(); x++) { + curView = (RoutesAsyncListView) getScreen(x); + if (curView!=null) curView.terminate(); + } + + //if (curView!=null) curView.terminate(); super.onPause(); } @Override protected void onStop() { - //there is no need to terminate RoutesAsyncListView as onPause takes care of this + for (int x=0; x < ShuttleModel.getSortedRoutes().size(); x++) { + curView = (RoutesAsyncListView) getScreen(x); + if (curView!=null) curView.terminate(); + } + + //if (curView!=null) curView.terminate(); super.onStop(); } @Override protected void onResume() { super.onResume(); - RoutesAsyncListView oldView = (RoutesAsyncListView) getScreen(startPos); - if(oldView!=null) oldView.onSelected(); + if (curView!=null) curView.onSelected(); } @@ -77,27 +84,23 @@ void createViews() { RouteItem r = ShuttleModel.getSortedRoutes().get(x); - String routeId = r.route_id; //r.title; + String routeId = r.title; cv = new RoutesAsyncListView(this, routeId, r); addScreen(cv, r.title); } - setPosition(startPos); + setPosition(position); } @Override public void onPositionChanged(int newPosition, int oldPosition) { super.onPositionChanged(newPosition, oldPosition); Log.d("ZZZ","onPositionChanged"); - if (oldPosition == -1) - return; - - if (oldPosition >= 0) { - RoutesAsyncListView oldView = (RoutesAsyncListView) getScreen(oldPosition); - oldView.terminate(); + if(curView != null) { + curView.terminate(); } - selectedPos = newPosition; + curView = (RoutesAsyncListView) getScreen(newPosition); } @Override @@ -113,14 +116,16 @@ static void launchShuttleRouteMap(Context context, RouteItem routeItem, List getPrimaryMenuItems() { // } -} +} From a6a85e74a8409fb94eb1b0716f4dd2db2498b0d0 Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Fri, 16 May 2014 17:01:04 -0400 Subject: [PATCH 2/9] imported project into eclipse --- .classpath | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.classpath b/.classpath index 4020da010..a3524b094 100644 --- a/.classpath +++ b/.classpath @@ -1,7 +1,5 @@ - - @@ -11,5 +9,7 @@ + + From 30f692496db24acc024f2bbe0655bd09aac27ca1 Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Mon, 19 May 2014 16:00:35 -0400 Subject: [PATCH 3/9] Added OIDC activity module --- AndroidManifest.xml | 5 ++ res/drawable-hdpi/home_openidconnect.png | Bin 0 -> 12953 bytes res/drawable-mdpi/home_openidconnect.png | Bin 0 -> 5718 bytes .../mit/mitmobile2/HomeScreenActivity.java | 2 + .../mitmobile2/id/OpenIDConnectActivity.java | 34 +++++++++++ .../mitmobile2/id/OpenIDConnectModule.java | 53 ++++++++++++++++++ 6 files changed, 94 insertions(+) create mode 100644 res/drawable-hdpi/home_openidconnect.png create mode 100644 res/drawable-mdpi/home_openidconnect.png create mode 100644 src/edu/mit/mitmobile2/id/OpenIDConnectActivity.java create mode 100644 src/edu/mit/mitmobile2/id/OpenIDConnectModule.java diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 90adfa79e..8cfdb269a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -327,6 +327,11 @@ + + + + + diff --git a/res/drawable-hdpi/home_openidconnect.png b/res/drawable-hdpi/home_openidconnect.png new file mode 100644 index 0000000000000000000000000000000000000000..d6ecc555898246f40d017ee06d96d8aea2854110 GIT binary patch literal 12953 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 P00000NkvXXu0mjfPia|B literal 0 HcmV?d00001 diff --git a/res/drawable-mdpi/home_openidconnect.png b/res/drawable-mdpi/home_openidconnect.png new file mode 100644 index 0000000000000000000000000000000000000000..be385eb53e1c438e2163b2e91ceebe3f27cfa919 GIT binary patch literal 5718 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 getPrimaryOptions() { + return null; + } + + @Override + public List getSecondaryOptions() { + return null; + } + + @Override + public boolean onItemSelected(Activity activity, String id) { + return false; + } + + @Override + public String getLongName() { + return "OpenID Connect Test Application"; + } + + @Override + public String getShortName() { + return "OpenID Connect"; + } + + @Override + public Class getModuleHomeActivity() { + return OpenIDConnectActivity.class; + } + + @Override + public int getMenuIconResourceId() { + return R.drawable.home_openidconnect; + } + + @Override + public int getHomeIconResourceId() { + return R.drawable.home_openidconnect; + } + + +} From 8f2dff2bc1e204cbe822de0f89a09c3fc616aac0 Mon Sep 17 00:00:00 2001 From: Justin Richer Date: Mon, 19 May 2014 18:10:03 -0400 Subject: [PATCH 4/9] added OIDC layout and started connection activity (with callback) --- AndroidManifest.xml | 7 +- res/layout/openidconnect_home.xml | 92 ++++++++++++++ .../mitmobile2/id/OpenIDConnectActivity.java | 114 +++++++++++++++++- 3 files changed, 210 insertions(+), 3 deletions(-) create mode 100644 res/layout/openidconnect_home.xml diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 8cfdb269a..1f0f39282 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -328,8 +328,11 @@ - - + + + + + diff --git a/res/layout/openidconnect_home.xml b/res/layout/openidconnect_home.xml new file mode 100644 index 000000000..2279d07fa --- /dev/null +++ b/res/layout/openidconnect_home.xml @@ -0,0 +1,92 @@ + + + + + + + +