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

Merge commit 'refs/merge-requests/34' of git://gitorious.org/f-droid/fdroidclient into merge-requests/34

Browse Source
This commit is contained in:
Ciaran Gultnieks 2013-05-03 11:30:55 +01:00
commit 26e7875c02
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/fdroid/fdroid/AppListManager.java
View File

@ -120,7 +120,7 @@ public class AppListManager {
notifyLists(); notifyLists();
notifyActivity(); notifyActivity();
Log.d("FDroid", "Updated lists - " + allApps.size() + " allApps in total" Log.d("FDroid", "Updated lists - " + allApps.size() + " in total"
+ " (update took " + (System.currentTimeMillis() - startTime) + " (update took " + (System.currentTimeMillis() - startTime)
+ " ms)"); + " ms)");
} }

17
src/org/fdroid/fdroid/FDroid.java
View File

@ -19,6 +19,7 @@
package org.fdroid.fdroid; package org.fdroid.fdroid;
import android.content.*;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.support.v4.view.MenuItemCompat; import android.support.v4.view.MenuItemCompat;
import org.fdroid.fdroid.R; import org.fdroid.fdroid.R;
@ -26,8 +27,6 @@ import org.fdroid.fdroid.R;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.AlertDialog.Builder; import android.app.AlertDialog.Builder;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.content.pm.PackageInfo; import android.content.pm.PackageInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.net.Uri; import android.net.Uri;
@ -80,10 +79,6 @@ public class FDroid extends FragmentActivity {
createViews(); createViews();
getTabManager().createTabs(); getTabManager().createTabs();
// Must be done *after* createViews, because it will involve a
// callback to update the tab label for the "update" tab. This
// will fail unless the tabs have actually been created.
repopulateViews();
Intent i = getIntent(); Intent i = getIntent();
if (i.hasExtra("uri")) { if (i.hasExtra("uri")) {
@ -99,10 +94,16 @@ public class FDroid extends FragmentActivity {
} }
@Override @Override
protected void onStart() { protected void onResume() {
super.onStart(); super.onResume();
repopulateViews();
} }
/**
* Must be done *after* createViews, because it will involve a
* callback to update the tab label for the "update" tab. This
* will fail unless the tabs have actually been created.
*/
protected void repopulateViews() { protected void repopulateViews() {
manager.repopulateLists(); manager.repopulateLists();
} }