fix app loader

PowerExplorer · Jun 1, 2018 · 4bac75c · 4bac75c
1 parent 6cb1a89
commit 4bac75c
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 28 deletions.
diff --git a/PowerFileExplorer/src/main/java/net/gnu/explorer/AppsFragment.java b/PowerFileExplorer/src/main/java/net/gnu/explorer/AppsFragment.java
@@ -376,12 +376,8 @@ public void onItemSelected(
 			AdapterView<?> parent, View view, int position, long id) {
 			Log.i(TAG, "onItemSelected view " + view + ", position " + position + ", id " + id);
 			//showToast("Spinner1: position=" + position + " id=" + id);
-			AsyncTask.Status status;
 			synchronized (searchTask) {
-				if ((status = searchTask.getStatus()) == AsyncTask.Status.RUNNING
-					|| status == AsyncTask.Status.PENDING) {
-					searchTask.cancel(true);
-				}
+				searchTask.cancel(true);
 				searchTask = new SearchFileNameTask();
 				searchTask.execute(position);
 			}
@@ -398,12 +394,8 @@ public void afterTextChanged(final Editable text) {
 			final String filesearch = text.toString();
 			Log.d("quicksearch", "filesearch " + filesearch);
 			if (filesearch.length() > 0) {
-				AsyncTask.Status status;
 				synchronized (searchTask) {
-					if (((status = searchTask.getStatus()) == AsyncTask.Status.RUNNING
-						|| status == AsyncTask.Status.PENDING)) {
-						searchTask.cancel(true);
-					}
+					searchTask.cancel(true);
 					searchTask = new SearchFileNameTask();
 					searchTask.execute(filesearch);
 				}
@@ -459,9 +451,7 @@ protected ArrayList<AppInfo> doInBackground(Object... params) {
 
 		@Override
 		protected void onPostExecute(ArrayList<AppInfo> tempAppList) {
-			if (isCancelled()) {
-				return;
-			}
+
 			Collections.sort(tempAppList, appListSorter);
 			appList.clear();
 			appList.addAll(tempAppList);
@@ -681,11 +671,14 @@ public void loadlist(final boolean save) {
 		appLoadTask.execute();
 	}
 
-	class LoadAppListTask extends AsyncTask<Void, Void, ArrayList<AppInfo>> {
+	class LoadAppListTask extends AsyncTask<Void, ArrayList<AppInfo>, Void> {
 
 		private final int index, top;
 		private final boolean save;
 
+		public long prevUpdate = 0;
+		public boolean busyNoti = false;
+
 		public LoadAppListTask(final boolean save, final int top, final int index) {
 			this.save = save;
 			this.index = index;
@@ -694,11 +687,14 @@ public LoadAppListTask(final boolean save, final int top, final int index) {
 
 		@Override
 		protected void onPreExecute() {
+			appList.clear();
+			selectedInList1.clear();
+			appAdapter.notifyDataSetChanged();
 			mSwipeRefreshLayout.setRefreshing(true);
 		}
 
-		protected ArrayList<AppInfo> doInBackground(Void[] p1) {
-            final ArrayList<AppInfo> tempAppList = new ArrayList<AppInfo>();
+		protected Void doInBackground(Void[] p1) {
+            ArrayList<AppInfo> tempAppList = new ArrayList<AppInfo>(64);
 			try {
                 final PackageManager packageManager = activity.getPackageManager();
 				final List<PackageInfo> all_apps = packageManager.getInstalledPackages(PackageManager.GET_META_DATA);
@@ -709,31 +705,42 @@ protected ArrayList<AppInfo> doInBackground(Void[] p1) {
 
 					tempAppList.add(new AppInfo(packageManager, pinfo));
 
+					final long present = System.currentTimeMillis();
+					if (present - prevUpdate > 1000 && !busyNoti) {
+						prevUpdate = present;
+						publishProgress(tempAppList);
+						tempAppList = new ArrayList<>(64);
+					}
 					//packageInfos.add(pinfo);
 					//System.out.println( new ObjectDumper(pinfo).dump());
 				}
+				publishProgress(tempAppList);
 				//Collections.sort(layoutElems, new FileListSorter(0, sortby, asc, false));
             } catch (Throwable e) {
 				e.printStackTrace();
                 //Toast.makeText(getActivity(), "" + e, Toast.LENGTH_LONG).show();
             }
-            Collections.sort(tempAppList, appListSorter);
-			return tempAppList;
+            return null;//tempAppList;
         }
 
+		@Override
+		protected void onProgressUpdate(ArrayList<AppInfo>... values) {
+			super.onProgressUpdate(values);
+			busyNoti = true;
+			appList.addAll(values[0]);
+			appAdapter.notifyDataSetChanged();
+			busyNoti = false;
+			selectionStatusTV.setText(selectedInList1.size() + "/" + appList.size());
+		}
+
 		@Override
 		// Once the image is downloaded, associates it to the imageView
-		protected void onPostExecute(ArrayList<AppInfo> tempAppList) {
-			if (isCancelled()) {
-				return;
-			}
+		protected void onPostExecute(Void v) {
 			try {
-				appList.clear();
-				selectedInList1.clear();
-				appList.addAll(tempAppList);
+				Collections.sort(appList, appListSorter);
 				synchronized (tempOriDataSourceL1) {
 					tempOriDataSourceL1.clear();
-					tempOriDataSourceL1.addAll(tempAppList);
+					tempOriDataSourceL1.addAll(appList);
 				}
 
 				appAdapter.notifyDataSetChanged();

diff --git a/PowerFileExplorer/src/main/java/net/gnu/explorer/FileFrag.java b/PowerFileExplorer/src/main/java/net/gnu/explorer/FileFrag.java
@@ -226,8 +226,7 @@ public void onViewCreated(View v, Bundle savedInstanceState) {
 		mSwipeRefreshLayout.setColorSchemeResources(
 			android.R.color.holo_blue_bright,
 			android.R.color.holo_red_light);
-		mSwipeRefreshLayout.setProgressViewOffset(false, 0,
-												  (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 24, res.getDisplayMetrics()));
+		//mSwipeRefreshLayout.setProgressViewOffset(false, 0, (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 24, res.getDisplayMetrics()));
 
 		horizontalDivider0 = v.findViewById(R.id.horizontalDivider0);
 		horizontalDivider12 = v.findViewById(R.id.horizontalDivider12);