[npr-android-app] 2 new revisions pushed by justinfr...@gmail.com on 2012-01-20 00:37 GMT
npr-and...@googlecode.com
Revision: e7e25e0a47b7
Author: Justin Friberg <justin...@hotmail.com>
Date: Thu Jan 19 16:15:42 2012
Log: 1.6 fix, switch to coarse location, playlist playback fix, minor
bug f...
http://code.google.com/p/npr-android-app/source/detail?r=e7e25e0a47b7
Revision: a646de2b19f3
Author: Justin Friberg <justin...@hotmail.com>
Date: Thu Jan 19 16:32:00 2012
Log: String table for unknown error
http://code.google.com/p/npr-android-app/source/detail?r=a646de2b19f3
==============================================================================
Revision: e7e25e0a47b7
Author: Justin Friberg <justin...@hotmail.com>
Date: Thu Jan 19 16:15:42 2012
Log: 1.6 fix, switch to coarse location, playlist playback fix, minor
bug fixes
http://code.google.com/p/npr-android-app/source/detail?r=e7e25e0a47b7
Modified:
/Npr/AndroidManifest.xml
/Npr/src/org/npr/android/news/BannerView.java
/Npr/src/org/npr/android/news/NewsApplication.java
/Npr/src/org/npr/android/news/NewsListActivity.java
/Npr/src/org/npr/android/news/NewsStoryActivity.java
/Npr/src/org/npr/android/news/PlaybackService.java
/Npr/src/org/npr/android/news/StationListActivity.java
=======================================
--- /Npr/AndroidManifest.xml Fri Jan 6 11:10:49 2012
+++ /Npr/AndroidManifest.xml Thu Jan 19 16:15:42 2012
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.npr.android.news" android:versionName="2.2.0"
+ package="org.npr.android.news" android:versionName="2.2.1"
android:versionCode="3">
<application
android:label="@string/app_name"
@@ -87,10 +87,10 @@
<uses-permission
android:name="android.permission.INTERNET"/>
<uses-permission
- android:name="android.permission.ACCESS_FINE_LOCATION"/>
- <uses-permission
android:name="android.permission.ACCESS_MOCK_LOCATION"/>
<uses-permission
+ android:name="android.permission.ACCESS_COARSE_LOCATION"/>
+ <uses-permission
android:name="android.permission.READ_PHONE_STATE"/>
<uses-permission
android:name="android.permission.ACCESS_NETWORK_STATE"/>
=======================================
--- /Npr/src/org/npr/android/news/BannerView.java Fri Jan 6 11:10:49 2012
+++ /Npr/src/org/npr/android/news/BannerView.java Thu Jan 19 16:15:42 2012
@@ -154,7 +154,11 @@
@Override
protected void onDetachedFromWindow() {
super.onDetachedFromWindow();
-
+ cancelUpdates();
+ }
+
+ public void cancelUpdates() {
+ Log.d(LOG_TAG, "Banner close messages removed");
handler.removeMessages(MSG_START_CLOSE);
handler.removeMessages(MSG_SCROLL_IN);
handler.removeMessages(MSG_SCROLL_OUT);
=======================================
--- /Npr/src/org/npr/android/news/NewsApplication.java Sun May 22 12:54:47
2011
+++ /Npr/src/org/npr/android/news/NewsApplication.java Thu Jan 19 16:15:42
2012
@@ -85,9 +85,10 @@
* stations, will always find a value.
*/
private void launchLocationListeners() {
+
LocationManager lm =
(LocationManager) getSystemService(Context.LOCATION_SERVICE);
- List<String> providers = lm.getAllProviders();
+ List<String> providers = lm.getProviders(false);
for (String provider : providers) {
LocationListener listener = new LocationListener() {
=======================================
--- /Npr/src/org/npr/android/news/NewsListActivity.java Fri Jan 6 11:10:49
2012
+++ /Npr/src/org/npr/android/news/NewsListActivity.java Thu Jan 19 16:15:42
2012
@@ -74,6 +74,12 @@
private final Handler handler = new Handler() {
@Override
public void handleMessage(Message msg) {
+
+ // Ignore when list is empty, e.g. no connectivity
+ if (listAdapter.getCount() == 0) {
+ return;
+ }
+
switch (msg.what) {
case ListItemGestureListener.MSG_LONG_PRESS: {
@@ -245,6 +251,7 @@
playlistChangedReceiver = null;
}
handler.removeCallbacks(updateTime);
+ bannerView.cancelUpdates();
super.onStop();
}
=======================================
--- /Npr/src/org/npr/android/news/NewsStoryActivity.java Fri Jan 6
11:10:49 2012
+++ /Npr/src/org/npr/android/news/NewsStoryActivity.java Thu Jan 19
16:15:42 2012
@@ -125,8 +125,10 @@
if (storyId.equals(currentStoryId)) {
trackerItem = new TrackerItem();
workspace.setCurrentScreen(i);
- trackerItem.orgId = story.getOrganizations().size() > 0 ?
- story.getOrganizations().get(0).getId() : null;
+ List<Story.Organization> organizations = story.getOrganizations();
+ if (organizations != null && organizations.size() > 0) {
+ trackerItem.orgId = organizations.get(0).getId();
+ }
for (Story.Parent p : story.getParents()) {
if (p.isPrimary()) {
=======================================
--- /Npr/src/org/npr/android/news/PlaybackService.java Fri Jan 6 15:16:14
2012
+++ /Npr/src/org/npr/android/news/PlaybackService.java Thu Jan 19 16:15:42
2012
@@ -48,7 +48,6 @@
import java.net.URL;
import java.net.URLConnection;
import java.net.UnknownHostException;
-import java.sql.Connection;
import java.util.List;
public class PlaybackService extends Service implements
@@ -240,8 +239,10 @@
} else if (action.equals(SERVICE_SEEK_TO)) {
seekTo(intent.getIntExtra(EXTRA_SEEK_TO, 0));
} else if (action.equals(SERVICE_PLAY_NEXT)) {
+ seekToPosition = 0;
playNextEntry();
} else if (action.equals(SERVICE_PLAY_PREVIOUS)) {
+ seekToPosition = 0;
playPreviousEntry();
} else if (action.equals(SERVICE_STOP_PLAYBACK)) {
stopSelfResult(startId);
@@ -626,6 +627,7 @@
}
}
+ seekToPosition = 0;
if (current != null) {
Tracker.StopEvent e = new Tracker.StopEvent(current.getUrl());
Tracker.instance(getApplication()).trackLink(e);
=======================================
--- /Npr/src/org/npr/android/news/StationListActivity.java Fri Jan 6
15:16:14 2012
+++ /Npr/src/org/npr/android/news/StationListActivity.java Thu Jan 19
16:15:42 2012
@@ -375,21 +375,7 @@
Log.d(LOG_TAG, "finding local stations");
LocationManager lm =
(LocationManager) getSystemService(Context.LOCATION_SERVICE);
- Location location = null;
-
- // Order here matters. This will search the network provider first,
which is
- // more likely to be up to date. Since we are not actively polling,
this is
- // more resilient to changes (e.g. going on an airplane and touching
down
- // and not firing up the GPS again before running this app).
- String[] providers =
- {LocationManager.NETWORK_PROVIDER, LocationManager.GPS_PROVIDER};
- for (String provider : providers) {
- Location loc = lm.getLastKnownLocation(provider);
- if (loc != null) {
- location = loc;
- break;
- }
- }
+ Location location =
lm.getLastKnownLocation(LocationManager.NETWORK_PROVIDER);
if (location != null) {
double lat = location.getLatitude();
==============================================================================
Revision: a646de2b19f3
Author: Justin Friberg <justin...@hotmail.com>
Date: Thu Jan 19 16:32:00 2012
Log: String table for unknown error
http://code.google.com/p/npr-android-app/source/detail?r=a646de2b19f3
Modified:
/Npr/res/values/strings.xml
/Npr/src/org/npr/android/news/PlaylistView.java
=======================================
--- /Npr/res/values/strings.xml Fri Jan 6 11:10:49 2012
+++ /Npr/res/values/strings.xml Thu Jan 19 16:32:00 2012
@@ -29,10 +29,12 @@
<string name="msg_main_menu_about">About</string>
+ <string name="msg_unknown_error">Unknown error occurred.</string>
<string name="msg_playback_error">Unable to play media. Moving to the
next item.</string>
<string name="msg_playback_connection_error">Connection error. Retrying
in 30 seconds.</string>
+
<string name="msg_check_connection">Check connection and try
again.</string>
<string name="msg_share_story">Share this story</string>
=======================================
--- /Npr/src/org/npr/android/news/PlaylistView.java Fri Jan 6 15:16:14 2012
+++ /Npr/src/org/npr/android/news/PlaylistView.java Thu Jan 19 16:32:00 2012
@@ -503,13 +503,13 @@
@Override
public void onReceive(Context context, Intent intent) {
Log.d(LOG_TAG, "Playback error received - toasting message");
- String message = "Unknown error occurred.";
+ String message = context.getString(R.string.msg_unknown_error);
int error = intent.getIntExtra(PlaybackService.EXTRA_ERROR, -1);
if (error ==
PlaybackService.PLAYBACK_SERVICE_ERROR.Playback.ordinal()) {
message = context.getString(R.string.msg_playback_error);
} else if (error ==
PlaybackService.PLAYBACK_SERVICE_ERROR.Connection.ordinal()) {
- message = context.getString(R.string.connection_error);
+ message =
context.getString(R.string.msg_playback_connection_error);
}
Toast.makeText(context, message, Toast.LENGTH_LONG).show();
}