Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-30 08:34:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

show toast when update requested manually and nothing found

Browse source
This commit is contained in:
Eric House 2012-10-18 19:51:40 -07:00
parent e5feded0b1
commit 6c34f43df7
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
xwords4/android/XWords4/res/values/strings.xml
View file

@ -2105,6 +2105,7 @@
<!-- -->
<string name="gamel_menu_checkupdates">Check for updates</string>
<string name="checkupdates_none_found">Everything is up-to-date.</string>
<!-- -->
<string name="new_dict_avail">New wordlist available</string>
<!-- -->

2
xwords4/android/XWords4/src/org/eehouse/android/xw4/GamesList.java
View file

@ -584,7 +584,7 @@ public class GamesList extends XWListActivity
break;
case R.id.gamel_menu_checkupdates:
UpdateCheckReceiver.checkVersions( this );
UpdateCheckReceiver.checkVersions( this, true );
break;
case R.id.gamel_menu_prefs:

17
xwords4/android/XWords4/src/org/eehouse/android/xw4/UpdateCheckReceiver.java
View file

@ -29,6 +29,7 @@ import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager;
import android.net.Uri;
import android.os.SystemClock;
import android.widget.Toast;
import java.util.ArrayList;
import java.util.List;
@ -76,7 +77,7 @@ public class UpdateCheckReceiver extends BroadcastReceiver {
&& intent.getAction().equals( Intent.ACTION_BOOT_COMPLETED ) ) {
restartTimer( context );
} else {
checkVersions( context );
checkVersions( context, false );
restartTimer( context );
}
}
@ -101,7 +102,7 @@ public class UpdateCheckReceiver extends BroadcastReceiver {
interval_millis, pi );
}
public static void checkVersions( Context context )
public static void checkVersions( Context context, boolean fromUI )
{
JSONObject params = new JSONObject();
PackageManager pm = context.getPackageManager();
@ -155,15 +156,16 @@ public class UpdateCheckReceiver extends BroadcastReceiver {
if ( 0 < params.length() ) {
HttpPost post = makePost( context, "getUpdates" );
String json = runPost( post, params );
makeNotificationsIf( context, json, pm, packageName, dals );
makeNotificationsIf( context, fromUI, json, pm, packageName, dals );
}
}
private static void makeNotificationsIf( Context context,
private static void makeNotificationsIf( Context context, boolean fromUI,
String jstr, PackageManager pm,
String packageName,
DictUtils.DictAndLoc[] dals )
{
boolean gotOne = false;
try {
JSONObject jobj = new JSONObject( jstr );
if ( null != jobj ) {
@ -180,6 +182,7 @@ public class UpdateCheckReceiver extends BroadcastReceiver {
String body = context.getString( R.string.new_app_avail );
Utils.postNotification( context, intent, title, body,
url.hashCode() );
gotOne = true;
}
}
if ( jobj.has( k_DICTS ) ) {
@ -200,6 +203,7 @@ public class UpdateCheckReceiver extends BroadcastReceiver {
Utils.postNotification( context, intent,
R.string.new_dict_avail,
body, url.hashCode() );
gotOne = true;
}
}
}
@ -209,6 +213,11 @@ public class UpdateCheckReceiver extends BroadcastReceiver {
} catch ( PackageManager.NameNotFoundException nnfe ) {
DbgUtils.loge( nnfe );
}
if ( !gotOne && fromUI ) {
Toast.makeText( context, R.string.checkupdates_none_found,
Toast.LENGTH_SHORT ).show();
}
}
private static HttpPost makePost( Context context, String proc )