From a7d757cdb2f10efffa0dd1174c5453438cd3c8c4 Mon Sep 17 00:00:00 2001
From: Peter Serwylo <peter@serwylo.com>
Date: Mon, 21 Mar 2016 22:36:15 +1100
Subject: [PATCH] Remove unused code and fix some typos.

The old swap code used to delegate to the `AppDetails` activity when
touching an app in the swap view. Now it shows the install button
and download feedback inline. The code which used to exist is no
longer required.
---
 .../fdroid/views/swap/SwapAppsView.java       | 28 ++-----------------
 1 file changed, 2 insertions(+), 26 deletions(-)

diff --git a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppsView.java b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppsView.java
index 399c8621e..2598c76a2 100644
--- a/F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppsView.java
+++ b/F-Droid/src/org/fdroid/fdroid/views/swap/SwapAppsView.java
@@ -8,7 +8,6 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.database.ContentObserver;
 import android.database.Cursor;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
@@ -32,7 +31,6 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.AdapterView;
 import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.ListView;
@@ -110,12 +108,6 @@ public class SwapAppsView extends ListView implements
         // either reconnect with an existing loader or start a new one
         getActivity().getSupportLoaderManager().initLoader(LOADER_SWAPABLE_APPS, null, this);
 
-        setOnItemClickListener(new OnItemClickListener() {
-            public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
-                showAppDetails(position);
-            }
-        });
-
         displayImageOptions = Utils.getImageLoadingOptions().build();
 
         LocalBroadcastManager.getInstance(getActivity()).registerReceiver(
@@ -193,12 +185,6 @@ public class SwapAppsView extends ListView implements
         return getResources().getString(R.string.swap_success);
     }
 
-    private void showAppDetails(int position) {
-        Cursor c = (Cursor) adapter.getItem(position);
-        App app = new App(c);
-        // TODO: Show app details screen.
-    }
-
     @Override
     public CursorLoader onCreateLoader(int id, Bundle args) {
         Uri uri = TextUtils.isEmpty(mCurrentFilterString)
@@ -335,10 +321,10 @@ public class SwapAppsView extends ListView implements
                     this.app = app;
                     apkToInstall = null; // Force lazy loading to fetch the correct apk next time.
 
-                    // NOTE: Instead of continually unregistering and reregistering the observer
+                    // NOTE: Instead of continually unregistering and re-registering the observer
                     // (with a different URI), this could equally be done by only having one
                     // registration in the constructor, and using the ContentObserver.onChange(boolean, URI)
-                    // method and inspecting the URI to see if it maches. However, this was only
+                    // method and inspecting the URI to see if it matches. However, this was only
                     // implemented on API-16, so leaving like this for now.
                     getActivity().getContentResolver().unregisterContentObserver(appObserver);
                     getActivity().getContentResolver().registerContentObserver(
@@ -418,9 +404,6 @@ public class SwapAppsView extends ListView implements
         @Nullable
         private LayoutInflater inflater;
 
-        @Nullable
-        private Drawable defaultAppIcon;
-
         AppListAdapter(@NonNull Context context, @Nullable Cursor c) {
             super(context, c, FLAG_REGISTER_CONTENT_OBSERVER);
         }
@@ -433,13 +416,6 @@ public class SwapAppsView extends ListView implements
             return inflater;
         }
 
-        private Drawable getDefaultAppIcon(Context context) {
-            if (defaultAppIcon == null) {
-                defaultAppIcon = context.getResources().getDrawable(android.R.drawable.sym_def_app_icon);
-            }
-            return defaultAppIcon;
-        }
-
         @Override
         public View newView(Context context, Cursor cursor, ViewGroup parent) {
             View view = getInflater(context).inflate(R.layout.swap_app_list_item, parent, false);