Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-15 15:41:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

snapshot: now receives updates from the server and they show up in

Browse source 
menus etc. (after a restart.)
This commit is contained in:
Eric House 2014-04-20 06:49:26 -07:00
parent f0bd300f1b
commit 155dd6f19a
2 changed files with 30 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -74,7 +74,6 @@ public class UpdateCheckReceiver extends BroadcastReceiver {
private static final String k_PARAMS = "params";
private static final String k_DEVID = "did";
private static final String k_XLATEINFO = "xlatinfo";
private static final String k_CALLBACK = "callback";
@Override
public void onReceive( Context context, Intent intent )
@ -82,9 +81,6 @@ public class UpdateCheckReceiver extends BroadcastReceiver {
if ( null != intent && null != intent.getAction()
&& intent.getAction().equals( Intent.ACTION_BOOT_COMPLETED ) ) {
restartTimer( context );
} else if ( null != intent ) {
String callback = intent.getStringExtra( NEW_XLATION_CBK );
new UpdateQueryTask( context, callback ).execute();
} else {
checkVersions( context, false );
restartTimer( context );
@ -283,7 +279,6 @@ public class UpdateCheckReceiver extends BroadcastReceiver {
private PackageManager m_pm;
private String m_packageName;
private DictUtils.DictAndLoc[] m_dals;
private String m_callback;
public UpdateQueryTask( Context context, JSONObject params,
boolean fromUI, PackageManager pm,
@ -298,16 +293,9 @@ public class UpdateCheckReceiver extends BroadcastReceiver {
m_dals = dals;
}
public UpdateQueryTask( Context context, String callback )
{
m_context = context;
m_callback = callback;
}
@Override protected String doInBackground( Void... unused )
{
String rest = null == m_callback ? "getUpdates" : m_callback;
HttpPost post = makePost( m_context, rest );
HttpPost post = makePost( m_context, "getUpdates" );
String json = null;
if ( null != post ) {
json = runPost( post, m_params );
@ -318,11 +306,7 @@ public class UpdateCheckReceiver extends BroadcastReceiver {
@Override protected void onPostExecute( String json )
{
if ( null != json ) {
if ( null == m_callback ) {
makeNotificationsIf( json );
} else {
LocUtils.addXlation( m_context, json );
}
makeNotificationsIf( json );
}
}
@ -404,14 +388,7 @@ public class UpdateCheckReceiver extends BroadcastReceiver {
// translations info
if ( jobj.has( k_XLATEINFO ) ) {
JSONObject data = jobj.getJSONObject( k_XLATEINFO );
String callback = data.getString( k_CALLBACK );
Intent intent = new Intent( m_context, UpdateCheckReceiver.class );
intent.putExtra( NEW_XLATION_CBK, callback );
String body = LocUtils.getString( m_context,
R.string.new_xlation_avail );
Utils.postNotification( m_context, intent,
R.string.new_xlation_avail,
body, callback.hashCode() );
LocUtils.addXlation( m_context, data );
}
}
} catch ( org.json.JSONException jse ) {

28
xwords4/android/XWords4/src/org/eehouse/android/xw4/loc/LocUtils.java
View file

@ -231,8 +231,34 @@ public class LocUtils {
return result;
}
public static void addXlation( Context context, String jsonData )
private static final String k_OLD = "old";
private static final String k_NEW = "new";
private static final String k_PAIRS = "pairs";
public static void addXlation( Context context, JSONObject data )
{
try {
String version = DBUtils.getStringFor( context, k_XLATEVERS, "0" );
int newVersion = data.getInt( k_NEW );
JSONArray pairs = data.getJSONArray( k_PAIRS );
DbgUtils.logf( "got pairs of len %d, version %d", pairs.length(),
newVersion );
loadXlations( context );
for ( int ii = 0; ii < pairs.length(); ++ii ) {
JSONObject pair = pairs.getJSONObject( ii );
String key = pair.getString( "en" );
String txt = pair.getString( "loc" );
s_xlations.put( key, txt );
}
saveData( context );
DBUtils.setStringFor( context, k_XLATEVERS,
String.format( "%d", newVersion ) );
} catch ( org.json.JSONException jse ) {
DbgUtils.loge( jse );
}
}
protected static LocSearcher.Pair[] makePairs( Context context )