From 53bed0f2e12187db73304d249b1e75e729ad170f Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Fri, 17 Mar 2017 08:59:52 +1100
Subject: [PATCH 01/11] Change language to clarify auto download preference

The previous language hinted at the fact we auto download and install
updates like Google Play. This is not the case (unless you have
priv-ext). To clarify, now we "Automatically _fetch_ updates", ready to
install when the user initiates the install.

Fixes #839.
---
 app/src/main/res/values/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8867b0f75..2cc866a90 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -22,8 +22,8 @@
     <string name="update_interval_zero">No automatic app list updates</string>
     <string name="automatic_scan_wifi">Only on Wi-Fi</string>
     <string name="automatic_scan_wifi_on">Only update automatically on unmetered networks like Wi-Fi</string>
-    <string name="update_auto_download">Automatically download updates</string>
-    <string name="update_auto_download_summary">Download the update files in the background</string>
+    <string name="update_auto_download">Automatically fetch updates</string>
+    <string name="update_auto_download_summary">Updates are downloaded automatically and you are notified to install them</string>
     <string name="update_auto_install">Automatically install updates</string>
     <string name="update_auto_install_summary">Download and install update apps in the background</string>
     <string name="notify">Update notifications</string>

From b177dc2cda20dfb342421d29f8f95fdb579e4c89 Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Mon, 20 Mar 2017 19:42:14 +1100
Subject: [PATCH 02/11] Update "Nearby" splash screen to new UI.

Be sure to not hardcode "F-Droid" to ensure it is easier to rebadge
F-Droid if creating a whitelabel version.

Fixes #894.
---
 .../fdroid/views/main/MainViewController.java |  6 ++
 app/src/main/res/drawable/nearby_splash.xml   |  6 ++
 app/src/main/res/layout/main_tab_swap.xml     | 84 ++++++++++---------
 app/src/main/res/values/strings.xml           |  4 +
 4 files changed, 61 insertions(+), 39 deletions(-)
 create mode 100644 app/src/main/res/drawable/nearby_splash.xml

diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/MainViewController.java b/app/src/main/java/org/fdroid/fdroid/views/main/MainViewController.java
index e5e804c3b..72a4dcd17 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/main/MainViewController.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/main/MainViewController.java
@@ -8,6 +8,7 @@ import android.support.v7.widget.RecyclerView;
 import android.view.View;
 import android.widget.Button;
 import android.widget.FrameLayout;
+import android.widget.TextView;
 
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.views.fragments.PreferencesFragment;
@@ -75,6 +76,11 @@ class MainViewController extends RecyclerView.ViewHolder {
     public void bindSwapView() {
         View swapView = activity.getLayoutInflater().inflate(R.layout.main_tab_swap, frame, true);
 
+        // To allow for whitelabel versions of F-Droid, make sure not to hardcode "F-Droid" into our
+        // translation here.
+        TextView subtext = (TextView) swapView.findViewById(R.id.text2);
+        subtext.setText(activity.getString(R.string.nearby_splash__both_parties_need_fdroid, activity.getString(R.string.app_name)));
+
         Button startButton = (Button) swapView.findViewById(R.id.button);
         startButton.setOnClickListener(new View.OnClickListener() {
             @Override
diff --git a/app/src/main/res/drawable/nearby_splash.xml b/app/src/main/res/drawable/nearby_splash.xml
new file mode 100644
index 000000000..cee12a2cf
--- /dev/null
+++ b/app/src/main/res/drawable/nearby_splash.xml
@@ -0,0 +1,6 @@
+<vector android:height="24dp" android:viewportHeight="634.0"
+    android:viewportWidth="720.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#f9f9f9"
+        android:pathData="M105,0L105,321.3L0,387.7L0,405.9L105,339.5L105,392L104.6,392L104.6,407.5L105,407.5L105,633L120,633L120,407.5L209,407.5L209,633L224,633L224,407.5L393,407.5L498.7,633.1L514.6,633.6L408.7,407.5L624.5,407.5L624.5,633L639.5,633L639.5,470.5L720,435.9L720,419L639.5,453.6L639.5,67.1L720,67.1L720,51.5L120,51.5L120,0L105,0zM120,67.1L233.4,67.1L385.7,392L120,392L120,67.1zM249.1,67.1L624.5,67.1L624.5,392L401.4,392L249.1,67.1z"
+        android:strokeColor="#00000000" android:strokeWidth="1"/>
+</vector>
diff --git a/app/src/main/res/layout/main_tab_swap.xml b/app/src/main/res/layout/main_tab_swap.xml
index bc439185c..adc254e3e 100644
--- a/app/src/main/res/layout/main_tab_swap.xml
+++ b/app/src/main/res/layout/main_tab_swap.xml
@@ -4,60 +4,66 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ImageView
-        android:id="@+id/image"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:srcCompat="@drawable/swap_start_header"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent" />
+    android:layout_height="match_parent"
+    android:background="#FAFAFA">
 
     <TextView
         android:id="@+id/text1"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:text="Download apps from people near you."
+        android:layout_marginEnd="48dp"
+        android:layout_marginLeft="48dp"
+        android:layout_marginRight="48dp"
+        android:layout_marginStart="48dp"
+        android:layout_marginTop="48dp"
+        android:text="@string/nearby_splash__download_apps_from_people_nearby"
+        android:textAlignment="center"
         android:textSize="20sp"
-        android:textAlignment="center"
-        app:layout_constraintTop_toBottomOf="@+id/image"
-        app:layout_constraintRight_toRightOf="parent"
+        android:textColor="#4a4a4a"
         app:layout_constraintLeft_toLeftOf="parent"
-        android:layout_marginTop="32dp"
-        android:layout_marginEnd="48dp"
-        android:layout_marginRight="48dp"
-        android:layout_marginStart="48dp"
-        android:layout_marginLeft="48dp" />
-
-    <!-- TODO: Use @string/app_name instead of "F-Droid". -->
-    <!-- TODO: The swap process helps to get F-Droid to the other user. That should probably be made a bit clearer here. -->
-    <TextView
-        android:id="@+id/text2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="Participants must have F-Droid installed."
-        android:textSize="14sp"
-        android:textAlignment="center"
-        app:layout_constraintTop_toBottomOf="@+id/text1"
         app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintLeft_toLeftOf="parent"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="48dp"
-        android:layout_marginRight="48dp"
-        android:layout_marginStart="48dp"
-        android:layout_marginLeft="48dp" />
+        app:layout_constraintTop_toTopOf="parent" />
 
     <Button
         android:id="@+id/button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Find people near me"
+        android:text="@string/nearby_splash__find_people_button"
         style="@style/DetailsSecondaryButtonStyle"
-        app:layout_constraintTop_toBottomOf="@+id/text2"
+        app:layout_constraintTop_toBottomOf="@+id/text1"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintLeft_toLeftOf="parent"
-        android:layout_marginTop="16dp" />
+        android:layout_marginTop="24dp" />
+
+    <TextView
+        android:id="@+id/text2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        tools:text="@string/nearby_splash__both_parties_need_fdroid"
+        android:textSize="15sp"
+        android:textAlignment="center"
+        android:textColor="#5B5B5B"
+        app:layout_constraintTop_toBottomOf="@+id/button"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="48dp"
+        android:layout_marginRight="48dp"
+        android:layout_marginStart="48dp"
+        android:layout_marginLeft="48dp" />
+
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:srcCompat="@drawable/nearby_splash"
+        android:importantForAccessibility="no"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text2"
+        android:layout_marginTop="36dp"
+        android:tint="#f5f5f5"
+        android:scaleType="fitXY" />
 
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2cc866a90..ece79ae1c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -342,6 +342,10 @@
     <string name="system_uninstall_button">Uninstall</string>
     <string name="system_install_not_supported">Installation of F-Droid Privileged Extension is currently not supported on Android 5.1 or later.</string>
 
+    <string name="nearby_splash__download_apps_from_people_nearby">No internet? Download apps from people near you!</string>
+    <string name="nearby_splash__find_people_button">Find people near me</string>
+    <string name="nearby_splash__both_parties_need_fdroid">Both parties need %1$s to use nearby.</string>
+
     <string name="swap_nfc_title">Touch to swap</string>
     <string name="swap_nfc_description">If your friend has F-Droid and NFC turned on touch your devices together.</string>
     <string name="swap_join_same_wifi">Join the same Wi-Fi as your friend</string>

From 15be01ada95eac484f70d05eb590ef9a2011c87b Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Wed, 22 Mar 2017 12:11:39 +1100
Subject: [PATCH 03/11] Ignore UI dumps from Android Studio/DDMS.

These are useful for debugging things like padding/margin issues, but
they get dumped to the source dir by default.
---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 91d7c59a9..aef3c14ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,6 @@ extern/*/*/libs/
 
 # Tests
 junit-report.xml
+
+# Screen dumps from Android Studio/DDMS
+captures/

From d4584083af7482852c7c1d3efb5a00acb880425f Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Wed, 22 Mar 2017 12:27:58 +1100
Subject: [PATCH 04/11] Refactor button styles for clearer distinction between
 large/small.

Small ones are used in the "Updates" screen, whereas large are used
elsewhere (e.g. in the app details, but also the "Start swap" screen).
---
 app/src/main/res/layout/app_details2_header.xml |  1 -
 .../res/layout/updateable_app_status_item.xml   |  2 +-
 app/src/main/res/values/styles_detail.xml       | 17 +++++++----------
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/app/src/main/res/layout/app_details2_header.xml b/app/src/main/res/layout/app_details2_header.xml
index 2c14167d6..c2b3ada6c 100755
--- a/app/src/main/res/layout/app_details2_header.xml
+++ b/app/src/main/res/layout/app_details2_header.xml
@@ -151,7 +151,6 @@
                     android:layout_marginStart="8dp"
                     android:layout_weight="1"
                     android:ellipsize="marquee"
-                    android:padding="12dp"
                     tools:text="THIS IS 2" />
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/updateable_app_status_item.xml b/app/src/main/res/layout/updateable_app_status_item.xml
index 3d71775fc..fa72957c3 100644
--- a/app/src/main/res/layout/updateable_app_status_item.xml
+++ b/app/src/main/res/layout/updateable_app_status_item.xml
@@ -72,7 +72,7 @@
 
     <Button
         android:id="@+id/action_button"
-        style="@style/DetailsPrimaryButtonStyle"
+        style="@style/DetailsPrimaryButtonStyleSmall"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="16dp"
diff --git a/app/src/main/res/values/styles_detail.xml b/app/src/main/res/values/styles_detail.xml
index 2a6b07c86..885879496 100644
--- a/app/src/main/res/values/styles_detail.xml
+++ b/app/src/main/res/values/styles_detail.xml
@@ -1,30 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="DetailsButtonStyleBase">
-        <item name="android:paddingTop">5dp</item>
-        <item name="android:paddingBottom">5dp</item>
-        <item name="android:paddingLeft">20dp</item>
-        <item name="android:paddingRight">20dp</item>
         <item name="android:textSize">12sp</item>
         <item name="android:textStyle">normal</item>
-    </style>
+        <item name="android:minHeight">32dp</item>
+        <item name="android:minWidth">0dp</item>
+        <item name="android:padding">12dp</item>
+    </style>qgi
 
     <style name="DetailsButtonStyle" parent="DetailsButtonStyleBase" />
 
     <style name="DetailsPrimaryButtonStyle" parent="DetailsButtonStyle">
         <item name="android:textColor">#ffffff</item>
         <item name="android:background">@drawable/button_primary_background_selector</item>
+    </style>
+
+    <style name="DetailsPrimaryButtonStyleSmall" parent="DetailsPrimaryButtonStyle">
         <item name="android:padding">8dp</item>
-        <item name="android:minHeight">32dp</item>
-        <item name="android:minWidth">0dp</item>
     </style>
 
     <style name="DetailsSecondaryButtonStyle" parent="DetailsButtonStyle">
         <item name="android:textColor">@color/fdroid_blue</item>
         <item name="android:background">@drawable/button_secondary_background_selector</item>
-        <item name="android:padding">8dp</item>
-        <item name="android:minHeight">32dp</item>
-        <item name="android:minWidth">0dp</item>
     </style>
 
     <style name="DetailsMoreButtonStyle">

From ba503812e4e312e124420a6e6843acf3528c9cfd Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Wed, 22 Mar 2017 13:00:51 +1100
Subject: [PATCH 05/11] Don't listen for the same broadcast events twice.

Caused crashes when we incorrectly provided info to the recyler view
about which items had been added/removed.
---
 .../java/org/fdroid/fdroid/views/main/MainViewAdapter.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/MainViewAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/main/MainViewAdapter.java
index 7731c89c3..aeaf7e775 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/main/MainViewAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/main/MainViewAdapter.java
@@ -69,7 +69,8 @@ class MainViewAdapter extends RecyclerView.Adapter<MainViewController> {
                 holder.bindSwapView();
                 break;
             case R.id.updates:
-                holder.bindUpdates();
+                // Hold of until onViewAttachedToWindow, because that is where we want to start listening
+                // for broadcast events (which is what the data binding does).
                 break;
             case R.id.settings:
                 holder.bindSettingsView();

From bb7fca73829d472ac5ff74497e8b134de5e3d2e7 Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Wed, 22 Mar 2017 14:03:53 +1100
Subject: [PATCH 06/11] Remember search input after hitting "Back" from app
 details.

Move logic which parses intent and forceably sets the text of our search
input to onCreate(), not onResume(). onCreate() is invoked each time a
new intent is sent to open up this activity. That is, each time a new
category is opened or a new search request is received. onResume() is
called much more often than this, including when the user is directed to
a new activity and then returns to the search screen after hitting back.
In this case we don't want to remove the search query the user had and
replace it with the data in the original intent.
---
 .../org/fdroid/fdroid/views/apps/AppListActivity.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java
index c8c3e777b..2da8b69ce 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListActivity.java
@@ -26,6 +26,7 @@ public class AppListActivity extends AppCompatActivity implements LoaderManager.
 
     public static final String EXTRA_CATEGORY = "org.fdroid.fdroid.views.apps.AppListActivity.EXTRA_CATEGORY";
     public static final String EXTRA_SEARCH_TERMS = "org.fdroid.fdroid.views.apps.AppListActivity.EXTRA_SEARCH_TERMS";
+
     private RecyclerView appView;
     private AppListAdapter appAdapter;
     private String category;
@@ -78,12 +79,11 @@ public class AppListActivity extends AppCompatActivity implements LoaderManager.
         appView.setHasFixedSize(true);
         appView.setLayoutManager(new LinearLayoutManager(this));
         appView.setAdapter(appAdapter);
+
+        parseIntentForSearchQuery();
     }
 
-    @Override
-    protected void onResume() {
-        super.onResume();
-
+    private void parseIntentForSearchQuery() {
         Intent intent = getIntent();
         category = intent.hasExtra(EXTRA_CATEGORY) ? intent.getStringExtra(EXTRA_CATEGORY) : null;
         searchTerms = intent.hasExtra(EXTRA_SEARCH_TERMS) ? intent.getStringExtra(EXTRA_SEARCH_TERMS) : null;

From bf8a61765d139bfffed39a5334a04163ba6fa83d Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Thu, 23 Mar 2017 20:15:29 +1100
Subject: [PATCH 07/11] Fix padding on bottom navigation.

Default padding specified is 12dp which is not very generous.
This reduces it to 2dp for seemingly good effect. Yet to see what it
looks like with longer translations of other languages, but time will
tell.
---
 app/src/main/res/values/dimens.xml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 29f7f843f..fc3e85f9f 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -23,6 +23,10 @@
     <dimen name="whats_new__padding__app_card__horizontal">12dp</dimen>
     <dimen name="whats_new__padding__app_card__vertical">10dp</dimen>
 
+    <!-- Used by the BottomNavigation library so that our text labels are not truncated so easily.
+         The default is 12dp or something like that which only really allows for very short labels. -->
+    <dimen name="fixed_width_padding">2dp</dimen>
+
     <dimen name="category_preview__app_list__padding__horizontal">4dp</dimen>
     <dimen name="category_preview__app_list__padding__horizontal__first">72dp</dimen>
     <dimen name="category_preview__app_list__padding__vertical">18dp</dimen>

From b179aaecff7ab909aff1a24df3f24ca744b3d479 Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Thu, 23 Mar 2017 21:10:52 +1100
Subject: [PATCH 08/11] Remove final dependency on AppDetails (the old one).

In a future MR I will remove this class completely, but this just
ensures that touching a notification will not send the user to the old
AppDetails (instead sending them to AppDetails2).
---
 app/src/main/java/org/fdroid/fdroid/AppDetails.java    |  5 ++---
 app/src/main/java/org/fdroid/fdroid/AppDetails2.java   |  5 +++--
 .../java/org/fdroid/fdroid/AppUpdateStatusManager.java | 10 +++++-----
 app/src/main/java/org/fdroid/fdroid/FDroid.java        |  2 +-
 .../java/org/fdroid/fdroid/NotificationHelper.java     |  2 +-
 .../fdroid/views/apps/AppListItemController.java       |  3 +--
 .../fdroid/views/categories/AppCardController.java     |  3 +--
 .../fdroid/fdroid/views/fragments/AppListFragment.java |  2 +-
 .../fdroid/views/fragments/PreferencesFragment.java    |  6 +++---
 .../org/fdroid/fdroid/views/main/MainActivity.java     |  3 +--
 10 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/AppDetails.java b/app/src/main/java/org/fdroid/fdroid/AppDetails.java
index 15e0539e4..fec76994c 100644
--- a/app/src/main/java/org/fdroid/fdroid/AppDetails.java
+++ b/app/src/main/java/org/fdroid/fdroid/AppDetails.java
@@ -107,7 +107,6 @@ public class AppDetails extends AppCompatActivity {
     private static final int REQUEST_PERMISSION_DIALOG = 3;
     private static final int REQUEST_UNINSTALL_DIALOG = 4;
 
-    public static final String EXTRA_APPID = "appid";
     public static final String EXTRA_FROM = "from";
     public static final String EXTRA_HINT_SEARCHING = "searching";
 
@@ -351,12 +350,12 @@ public class AppDetails extends AppCompatActivity {
      * and not externally.
      */
     private String getPackageNameFromIntent(Intent intent) {
-        if (!intent.hasExtra(EXTRA_APPID)) {
+        if (!intent.hasExtra(AppDetails2.EXTRA_APPID)) {
             Log.e(TAG, "No package name found in the intent!");
             return null;
         }
 
-        return intent.getStringExtra(EXTRA_APPID);
+        return intent.getStringExtra(AppDetails2.EXTRA_APPID);
     }
 
     @Override
diff --git a/app/src/main/java/org/fdroid/fdroid/AppDetails2.java b/app/src/main/java/org/fdroid/fdroid/AppDetails2.java
index a705211a4..1ce4ef10c 100644
--- a/app/src/main/java/org/fdroid/fdroid/AppDetails2.java
+++ b/app/src/main/java/org/fdroid/fdroid/AppDetails2.java
@@ -53,6 +53,7 @@ import org.fdroid.fdroid.views.apps.FeatureImage;
 
 public class AppDetails2 extends AppCompatActivity implements ShareChooserDialog.ShareChooserDialogListener, AppDetailsRecyclerViewAdapter.AppDetailsRecyclerViewAdapterCallbacks {
 
+    public static final String EXTRA_APPID = "appid";
     private static final String TAG = "AppDetails2";
 
     private static final int REQUEST_ENABLE_BLUETOOTH = 2;
@@ -170,11 +171,11 @@ public class AppDetails2 extends AppCompatActivity implements ShareChooserDialog
     }
 
     private String getPackageNameFromIntent(Intent intent) {
-        if (!intent.hasExtra(AppDetails.EXTRA_APPID)) {
+        if (!intent.hasExtra(EXTRA_APPID)) {
             Log.e(TAG, "No package name found in the intent!");
             return null;
         }
-        return intent.getStringExtra(AppDetails.EXTRA_APPID);
+        return intent.getStringExtra(EXTRA_APPID);
     }
 
     /**
diff --git a/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java b/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java
index c6d48b7cb..5f7788ef5 100644
--- a/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java
+++ b/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusManager.java
@@ -392,16 +392,16 @@ public final class AppUpdateStatusManager {
 
     /**
      * Get a {@link PendingIntent} for a {@link Notification} to send when it
-     * is clicked.  {@link AppDetails} handles {@code Intent}s that are missing
-     * or bad {@link AppDetails#EXTRA_APPID}, so it does not need to be checked
+     * is clicked.  {@link AppDetails2} handles {@code Intent}s that are missing
+     * or bad {@link AppDetails2#EXTRA_APPID}, so it does not need to be checked
      * here.
      */
     private PendingIntent getAppDetailsIntent(Apk apk) {
-        Intent notifyIntent = new Intent(context, AppDetails.class)
-                .putExtra(AppDetails.EXTRA_APPID, apk.packageName);
+        Intent notifyIntent = new Intent(context, AppDetails2.class)
+                .putExtra(AppDetails2.EXTRA_APPID, apk.packageName);
 
         return TaskStackBuilder.create(context)
-                .addParentStack(AppDetails.class)
+                .addParentStack(AppDetails2.class)
                 .addNextIntent(notifyIntent)
                 .getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT);
     }
diff --git a/app/src/main/java/org/fdroid/fdroid/FDroid.java b/app/src/main/java/org/fdroid/fdroid/FDroid.java
index f8a6a30ff..5aff91827 100644
--- a/app/src/main/java/org/fdroid/fdroid/FDroid.java
+++ b/app/src/main/java/org/fdroid/fdroid/FDroid.java
@@ -243,7 +243,7 @@ public class FDroid extends AppCompatActivity implements SearchView.OnQueryTextL
         if (!TextUtils.isEmpty(packageName)) {
             Utils.debugLog(TAG, "FDroid launched via app link for '" + packageName + "'");
             Intent intentToInvoke = new Intent(this, AppDetails2.class);
-            intentToInvoke.putExtra(AppDetails.EXTRA_APPID, packageName);
+            intentToInvoke.putExtra(AppDetails2.EXTRA_APPID, packageName);
             startActivity(intentToInvoke);
             finish();
         } else if (!TextUtils.isEmpty(query)) {
diff --git a/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java b/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java
index 258ef046b..55e3625d4 100644
--- a/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java
+++ b/app/src/main/java/org/fdroid/fdroid/NotificationHelper.java
@@ -185,7 +185,7 @@ class NotificationHelper {
         if (entry.status == AppUpdateStatusManager.Status.Unknown) {
             return true;
         } else if ((entry.status == AppUpdateStatusManager.Status.Downloading || entry.status == AppUpdateStatusManager.Status.ReadyToInstall || entry.status == AppUpdateStatusManager.Status.InstallError) &&
-                (AppDetails.isAppVisible(entry.app.packageName) || AppDetails2.isAppVisible(entry.app.packageName))) {
+                AppDetails2.isAppVisible(entry.app.packageName)) {
             // Ignore downloading, readyToInstall and installError if we are showing the details screen for this app
             return true;
         }
diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java
index 7e6fa22eb..d574a7c57 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java
@@ -29,7 +29,6 @@ import android.widget.TextView;
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
 
-import org.fdroid.fdroid.AppDetails;
 import org.fdroid.fdroid.AppDetails2;
 import org.fdroid.fdroid.AppUpdateStatusManager;
 import org.fdroid.fdroid.R;
@@ -396,7 +395,7 @@ public class AppListItemController extends RecyclerView.ViewHolder {
             }
 
             Intent intent = new Intent(activity, AppDetails2.class);
-            intent.putExtra(AppDetails.EXTRA_APPID, currentApp.packageName);
+            intent.putExtra(AppDetails2.EXTRA_APPID, currentApp.packageName);
             if (Build.VERSION.SDK_INT >= 21) {
                 Pair<View, String> iconTransitionPair = Pair.create((View) icon, activity.getString(R.string.transition_app_item_icon));
                 Bundle bundle = ActivityOptionsCompat.makeSceneTransitionAnimation(activity, iconTransitionPair).toBundle();
diff --git a/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java b/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java
index bf80ab41a..343d9e5a0 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/categories/AppCardController.java
@@ -22,7 +22,6 @@ import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.assist.FailReason;
 import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
 
-import org.fdroid.fdroid.AppDetails;
 import org.fdroid.fdroid.AppDetails2;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.Utils;
@@ -129,7 +128,7 @@ public class AppCardController extends RecyclerView.ViewHolder implements ImageL
         }
 
         Intent intent = new Intent(activity, AppDetails2.class);
-        intent.putExtra(AppDetails.EXTRA_APPID, currentApp.packageName);
+        intent.putExtra(AppDetails2.EXTRA_APPID, currentApp.packageName);
         if (Build.VERSION.SDK_INT >= 21) {
             Pair<View, String> iconTransitionPair = Pair.create((View) icon, activity.getString(R.string.transition_app_item_icon));
 
diff --git a/app/src/main/java/org/fdroid/fdroid/views/fragments/AppListFragment.java b/app/src/main/java/org/fdroid/fdroid/views/fragments/AppListFragment.java
index 3a91af37c..d156933a3 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/fragments/AppListFragment.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/fragments/AppListFragment.java
@@ -169,7 +169,7 @@ public abstract class AppListFragment extends ListFragment implements
         if (cursor != null) {
             final App app = new App(cursor);
             Intent intent = getAppDetailsIntent(useNewDetailsActivity);
-            intent.putExtra(AppDetails.EXTRA_APPID, app.packageName);
+            intent.putExtra(AppDetails2.EXTRA_APPID, app.packageName);
             intent.putExtra(AppDetails.EXTRA_FROM, getFromTitle());
             if (Build.VERSION.SDK_INT >= 21) {
                 Pair<View, String> iconTransitionPair = Pair.create(view.findViewById(R.id.icon),
diff --git a/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java b/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
index 1e9d97a0a..f0ff7a412 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
@@ -13,7 +13,7 @@ import android.preference.PreferenceCategory;
 import android.support.v4.preference.PreferenceFragment;
 import android.text.TextUtils;
 
-import org.fdroid.fdroid.AppDetails;
+import org.fdroid.fdroid.AppDetails2;
 import org.fdroid.fdroid.CleanCacheService;
 import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.Preferences;
@@ -261,8 +261,8 @@ public class PreferencesFragment extends PreferenceFragment
             @Override
             public boolean onPreferenceClick(Preference preference) {
                 // Open details of F-Droid Privileged
-                Intent intent = new Intent(getActivity(), AppDetails.class);
-                intent.putExtra(AppDetails.EXTRA_APPID,
+                Intent intent = new Intent(getActivity(), AppDetails2.class);
+                intent.putExtra(AppDetails2.EXTRA_APPID,
                         PrivilegedInstaller.PRIVILEGED_EXTENSION_PACKAGE_NAME);
                 startActivity(intent);
 
diff --git a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
index bd7711053..759ac2358 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/main/MainActivity.java
@@ -23,7 +23,6 @@ import com.ashokvarma.bottomnavigation.BadgeItem;
 import com.ashokvarma.bottomnavigation.BottomNavigationBar;
 import com.ashokvarma.bottomnavigation.BottomNavigationItem;
 
-import org.fdroid.fdroid.AppDetails;
 import org.fdroid.fdroid.AppDetails2;
 import org.fdroid.fdroid.AppUpdateStatusManager;
 import org.fdroid.fdroid.FDroidApp;
@@ -281,7 +280,7 @@ public class MainActivity extends AppCompatActivity implements BottomNavigationB
         if (!TextUtils.isEmpty(packageName)) {
             Utils.debugLog(TAG, "FDroid launched via app link for '" + packageName + "'");
             Intent intentToInvoke = new Intent(this, AppDetails2.class);
-            intentToInvoke.putExtra(AppDetails.EXTRA_APPID, packageName);
+            intentToInvoke.putExtra(AppDetails2.EXTRA_APPID, packageName);
             startActivity(intentToInvoke);
             finish();
         } else if (!TextUtils.isEmpty(query)) {

From b9c429d22d36d978e4897398a3539abc7087ff93 Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Thu, 23 Mar 2017 21:30:47 +1100
Subject: [PATCH 09/11] Add "App X successfully installed" to updates tab.

This notification is kind of weird, because the only ways it can be
dismissed is by:
 * Swiping a notification away from the notification drawer.
 * Closing and reopening F-Droid.

However I think the UX is still pretty nice:
 * Tells the user that it worked.
 * Allows them to navigate to it if desired.
---
 .../fdroid/views/apps/AppListItemController.java   | 14 ++++++++++++++
 .../fdroid/views/updates/UpdatesAdapter.java       |  4 ++--
 app/src/main/res/values/strings.xml                |  1 +
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java
index d574a7c57..d434582fa 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/apps/AppListItemController.java
@@ -253,6 +253,18 @@ public class AppListItemController extends RecyclerView.ViewHolder {
         return false;
     }
 
+    /**
+     * Queries the {@link AppUpdateStatusManager} and asks if the app was just successfully installed.
+     */
+    private boolean wasSuccessfullyInstalled(@NonNull App app) {
+        for (AppUpdateStatusManager.AppUpdateStatus appStatus : AppUpdateStatusManager.getInstance(activity).getByPackageName(app.packageName)) {
+            if (appStatus.status == AppUpdateStatusManager.Status.Installed) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * The app name {@link TextView} is used for a few reasons:
      *  * Display name + summary of the app (most common).
@@ -276,6 +288,8 @@ public class AppListItemController extends RecyclerView.ViewHolder {
             }
         } else if (isDownloading(app)) {
             name.setText(activity.getString(R.string.app_list__name__downloading_in_progress, app.name));
+        } else if (wasSuccessfullyInstalled(app)) {
+            name.setText(activity.getString(R.string.app_list__name__successfully_installed, app.name));
         } else {
             name.setText(Utils.formatAppNameAndSummary(app.name, app.summary));
         }
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java
index b144b957f..a9620c050 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java
@@ -92,8 +92,7 @@ public class UpdatesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
 
     /**
      * There are some statuses managed by {@link AppUpdateStatusManager} which we don't care about
-     * for the "Updates" view. For example {@link org.fdroid.fdroid.AppUpdateStatusManager.Status#Installed}
-     * apps are not interesting in the Updates" view at this point in time. Also, although this
+     * for the "Updates" view. For example Also, although this
      * adapter does know about apps with updates availble, it does so by querying the database not
      * by querying the app update status manager. As such, apps with the status
      * {@link org.fdroid.fdroid.AppUpdateStatusManager.Status#UpdateAvailable} are not interesting here.
@@ -101,6 +100,7 @@ public class UpdatesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
     private boolean shouldShowStatus(AppUpdateStatusManager.AppUpdateStatus status) {
         return status.status == AppUpdateStatusManager.Status.Unknown ||
                 status.status == AppUpdateStatusManager.Status.Downloading ||
+                status.status == AppUpdateStatusManager.Status.Installed ||
                 status.status == AppUpdateStatusManager.Status.ReadyToInstall;
     }
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ece79ae1c..1d51af95f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -73,6 +73,7 @@
     <string name="app_list__name__downloaded_and_ready_to_update">Update %1$s</string>
     <string name="app_list__name__downloaded_and_ready_to_install">Install %1$s</string>
     <string name="app_list__name__downloading_in_progress">Downloading %1$s</string>
+    <string name="app_list__name__successfully_installed">%1$s successfully installed</string>
     <plurals name="app_list__age__released_x_days_ago">
         <item quantity="one">Released %1$d day ago</item>
         <item quantity="other">Released %1$d days ago</item>

From 8ed62d22e14a43072fcf5d5f790f3876f73e08d4 Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Thu, 23 Mar 2017 22:15:13 +1100
Subject: [PATCH 10/11] Correctly listen for "Install complete" for previously
 downloaded apks.

This ensures that if the user has downloaded an update (manually or via
auto updates), then the UI will respond correctly once it is installed.
---
 .../fdroid/fdroid/AppUpdateStatusService.java |  2 +
 .../installer/InstallManagerService.java      | 38 ++++++++++++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusService.java b/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusService.java
index f9b0e370c..b3b43b54a 100644
--- a/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusService.java
+++ b/app/src/main/java/org/fdroid/fdroid/AppUpdateStatusService.java
@@ -12,6 +12,7 @@ import org.fdroid.fdroid.data.App;
 import org.fdroid.fdroid.data.AppProvider;
 import org.fdroid.fdroid.data.Schema;
 import org.fdroid.fdroid.installer.ApkCache;
+import org.fdroid.fdroid.installer.InstallManagerService;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -53,5 +54,6 @@ public class AppUpdateStatusService extends IntentService {
         }
 
         AppUpdateStatusManager.getInstance(this).addApks(apksReadyToInstall, AppUpdateStatusManager.Status.ReadyToInstall);
+        InstallManagerService.managePreviouslyDownloadedApks(this);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java b/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
index 51cc09f3d..7a80f3fc5 100644
--- a/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
+++ b/app/src/main/java/org/fdroid/fdroid/installer/InstallManagerService.java
@@ -68,6 +68,16 @@ public class InstallManagerService extends Service {
     private static final String ACTION_INSTALL = "org.fdroid.fdroid.installer.action.INSTALL";
     private static final String ACTION_CANCEL = "org.fdroid.fdroid.installer.action.CANCEL";
 
+    /**
+     * The install manager service needs to monitor downloaded apks so that it can wait for a user to
+     * install them and respond accordingly. Usually the thing which starts listening for such events
+     * does so directly after a download is complete. This works great, except when the user then
+     * subsequently closes F-Droid and opens it at a later date. Under these circumstances, a background
+     * service will scan all downloaded apks and notify the user about them. When it does so, the
+     * install manager service needs to add listeners for if the apks get installed.
+     */
+    private static final String ACTION_MANAGE_DOWNLOADED_APKS = "org.fdroid.fdroid.installer.action.ACTION_MANAGE_DOWNLOADED_APKS";
+
     private static final String EXTRA_APP = "org.fdroid.fdroid.installer.extra.APP";
     private static final String EXTRA_APK = "org.fdroid.fdroid.installer.extra.APK";
 
@@ -108,13 +118,19 @@ public class InstallManagerService extends Service {
     public int onStartCommand(Intent intent, int flags, int startId) {
         Utils.debugLog(TAG, "onStartCommand " + intent);
 
+        String action = intent.getAction();
+
+        if (ACTION_MANAGE_DOWNLOADED_APKS.equals(action)) {
+            registerInstallerReceiversForDownlaodedApks();
+            return START_NOT_STICKY;
+        }
+
         String urlString = intent.getDataString();
         if (TextUtils.isEmpty(urlString)) {
             Utils.debugLog(TAG, "empty urlString, nothing to do");
             return START_NOT_STICKY;
         }
 
-        String action = intent.getAction();
         if (ACTION_CANCEL.equals(action)) {
             DownloaderService.cancel(this, urlString);
             Apk apk = appUpdateStatusManager.getApk(urlString);
@@ -292,6 +308,20 @@ public class InstallManagerService extends Service {
                 DownloaderService.getIntentFilter(urlString));
     }
 
+    /**
+     * For each app in the {@link AppUpdateStatusManager.Status#ReadyToInstall} state, setup listeners
+     * so that if the user installs it then we can respond accordingly. This makes sure that whether
+     * the user just finished downloading it, or whether they downloaded it a day ago but have not yet
+     * installed it, we get the same experience upon completing an install.
+     */
+    private void registerInstallerReceiversForDownlaodedApks() {
+        for (AppUpdateStatusManager.AppUpdateStatus appStatus : AppUpdateStatusManager.getInstance(this).getAll()) {
+            if (appStatus.status == AppUpdateStatusManager.Status.ReadyToInstall) {
+                registerInstallerReceivers(Uri.parse(appStatus.getUniqueKey()));
+            }
+        }
+    }
+
     private void registerInstallerReceivers(Uri downloadUri) {
 
         BroadcastReceiver installReceiver = new BroadcastReceiver() {
@@ -363,4 +393,10 @@ public class InstallManagerService extends Service {
         intent.setData(Uri.parse(urlString));
         context.startService(intent);
     }
+
+    public static void managePreviouslyDownloadedApks(Context context) {
+        Intent intent = new Intent(context, InstallManagerService.class);
+        intent.setAction(ACTION_MANAGE_DOWNLOADED_APKS);
+        context.startService(intent);
+    }
 }

From 61d7ba9f295a8f65b55cd1c78ea22e0e5c6066b6 Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Thu, 23 Mar 2017 23:26:50 +1100
Subject: [PATCH 11/11] Start auto downloads once preference is enabled.

Fixes issue #896.
---
 .../views/fragments/PreferencesFragment.java  | 55 ++++++++++++++-----
 .../fdroid/views/updates/UpdatesAdapter.java  | 15 +++--
 .../views/updates/UpdatesViewBinder.java      |  2 +-
 3 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java b/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
index f0ff7a412..bd0ee94b2 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/fragments/PreferencesFragment.java
@@ -19,6 +19,7 @@ import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.Preferences;
 import org.fdroid.fdroid.PreferencesActivity;
 import org.fdroid.fdroid.R;
+import org.fdroid.fdroid.UpdateService;
 import org.fdroid.fdroid.installer.InstallHistoryService;
 import org.fdroid.fdroid.installer.PrivilegedInstaller;
 
@@ -271,21 +272,34 @@ public class PreferencesFragment extends PreferenceFragment
         });
     }
 
-    @Override
-    public void onResume() {
-        super.onResume();
+    /**
+     * If a user specifies they want to fetch updates automatically, then start the download of relevant
+     * updates as soon as they enable the feature.
+     * Also, if the user has the priv extention installed then change the label to indicate that it
+     * will actually _install_ apps, not just fetch their .apk file automatically.
+     */
+    private void initAutoFetchUpdatesPreference() {
+        updateAutoDownloadPref.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
 
-        getPreferenceScreen().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+                if (newValue instanceof Boolean && (boolean) newValue) {
+                    UpdateService.autoDownloadUpdates(getContext());
+                }
+                return true;
+            }
+        });
 
-        for (final String key : SUMMARIES_TO_UPDATE) {
-            updateSummary(key, false);
+        if (PrivilegedInstaller.isDefault(getContext())) {
+            updateAutoDownloadPref.setTitle(R.string.update_auto_install);
+            updateAutoDownloadPref.setSummary(R.string.update_auto_install_summary);
         }
+    }
 
-        currentKeepCacheTime = Preferences.get().getKeepCacheTime();
-
-        initPrivilegedInstallerPreference();
-        initUpdatePrivilegedExtensionPreference();
-        // this pref's default is dynamically set based on whether Orbot is installed
+    /**
+     * The default for "Use Tor" is dynamically set based on whether Orbot is installed.
+     */
+    private void initUseTorPreference() {
         boolean useTor = Preferences.get().isTorEnabled();
         useTorCheckPref.setDefaultValue(useTor);
         useTorCheckPref.setChecked(useTor);
@@ -308,11 +322,24 @@ public class PreferencesFragment extends PreferenceFragment
                 return true;
             }
         });
+    }
 
-        if (PrivilegedInstaller.isDefault(getContext())) {
-            updateAutoDownloadPref.setTitle(R.string.update_auto_install);
-            updateAutoDownloadPref.setSummary(R.string.update_auto_install_summary);
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        getPreferenceScreen().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
+
+        for (final String key : SUMMARIES_TO_UPDATE) {
+            updateSummary(key, false);
         }
+
+        currentKeepCacheTime = Preferences.get().getKeepCacheTime();
+
+        initAutoFetchUpdatesPreference();
+        initPrivilegedInstallerPreference();
+        initUpdatePrivilegedExtensionPreference();
+        initUseTorPreference();
     }
 
     @Override
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java b/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java
index a9620c050..db2dc1824 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesAdapter.java
@@ -57,6 +57,9 @@ import java.util.List;
  * repopulate it from the original source lists of data. When this is done, the adapter will notify
  * the recycler view that its data has changed. Sometimes it will also ask the recycler view to
  * scroll to the newly added item (if attached to the recycler view).
+ *
+ * TODO: If a user downloads an old version of an app (resulting in a new update being available
+ * instantly), then we need to refresh the list of apps to update.
  */
 public class UpdatesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> implements LoaderManager.LoaderCallbacks<Cursor> {
 
@@ -84,9 +87,6 @@ public class UpdatesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
                 .addDelegate(new UpdateableApp.Delegate(activity))
                 .addDelegate(new UpdateableAppsHeader.Delegate(activity));
 
-        populateAppStatuses();
-        notifyDataSetChanged();
-
         activity.getSupportLoaderManager().initLoader(0, null, this);
     }
 
@@ -245,11 +245,18 @@ public class UpdatesAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
     public void onLoaderReset(Loader<Cursor> loader) { }
 
     /**
+     * If this adapter is "active" then it is part of the current UI that the user is looking to.
+     * Under those circumstances, we want to make sure it is up to date, and also listen to the
+     * correct set of broadcasts.
      * Doesn't listen for {@link AppUpdateStatusManager#BROADCAST_APPSTATUS_CHANGED} because the
      * individual items in the recycler view will listen for the appropriate changes in state and
      * update themselves accordingly (if they are displayed).
      */
-    public void listenForStatusUpdates() {
+    public void setIsActive() {
+        appsToShowStatus.clear();
+        populateAppStatuses();
+        notifyDataSetChanged();
+
         IntentFilter filter = new IntentFilter();
         filter.addAction(AppUpdateStatusManager.BROADCAST_APPSTATUS_ADDED);
         filter.addAction(AppUpdateStatusManager.BROADCAST_APPSTATUS_REMOVED);
diff --git a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesViewBinder.java b/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesViewBinder.java
index c48f802dd..50d287bfe 100644
--- a/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesViewBinder.java
+++ b/app/src/main/java/org/fdroid/fdroid/views/updates/UpdatesViewBinder.java
@@ -24,7 +24,7 @@ public class UpdatesViewBinder {
     }
 
     public void bind() {
-        adapter.listenForStatusUpdates();
+        adapter.setIsActive();
     }
 
     public void unbind() {