Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git://gitorious.org/f-droid/fdroidclient

Browse Source
This commit is contained in:
David Black 2013-04-17 10:37:14 +01:00
commit e49de99203
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/org/fdroid/fdroid/FDroidApp.java
View File

@ -25,6 +25,7 @@ import java.util.concurrent.Semaphore;
import android.app.Application;
import android.util.Log;
import android.content.Context;
public class FDroidApp extends Application {
@ -43,7 +44,9 @@ public class FDroidApp extends Application {
icon_path.mkdir();
apps = null;
DB.initDB(getApplicationContext());
Context ctx = getApplicationContext();
DB.initDB(ctx);
UpdateService.schedule(ctx);
}

13
src/org/fdroid/fdroid/UpdateService.java
View File

@ -56,9 +56,8 @@ public class UpdateService extends IntentService implements ProgressListener {
}
// Schedule (or cancel schedule for) this service, according to the
// current preferences. Should be called a) at boot, or b) if the preference
// is changed.
// TODO: What if we get upgraded?
// current preferences. Should be called a) at boot, b) if the preference
// is changed, or c) on startup, in case we get upgraded.
public static void schedule(Context ctx) {
SharedPreferences prefs = PreferenceManager
@ -76,7 +75,11 @@ public class UpdateService extends IntentService implements ProgressListener {
alarm.setInexactRepeating(AlarmManager.ELAPSED_REALTIME,
SystemClock.elapsedRealtime() + 5000,
AlarmManager.INTERVAL_HOUR, pending);
Log.d("FDroid", "Update scheduler alarm set");
} else {
Log.d("FDroid", "Update scheduler alarm not set");
}
}
protected void sendStatus(int statusCode ) {
@ -122,11 +125,13 @@ public class UpdateService extends IntentService implements ProgressListener {
return;
}
long elapsed = System.currentTimeMillis() - lastUpdate;
if (elapsed < interval * 60 * 60) {
if (elapsed < interval * 60 * 60 * 1000) {
Log.d("FDroid", "Skipping update - done " + elapsed
+ "ms ago, interval is " + interval + " hours");
return;
}
} else {
Log.d("FDroid", "Unscheduled (manually requested) update");
}
boolean notify = prefs.getBoolean("updateNotify", false);