mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 04:43:54 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Using instance to override instead of subclass

Browse source
This commit is contained in:
misaochan 2016-01-24 21:22:48 +13:00
parent a51f4252bb
commit 55675f4428
1 changed files with 41 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

87
commons/src/main/java/fr/free/nrw/commons/category/CategorizationFragment.java
View file

@ -53,8 +53,8 @@ public class CategorizationFragment extends SherlockFragment{
protected HashMap<String, ArrayList<String>> categoriesCache; protected HashMap<String, ArrayList<String>> categoriesCache;
private final Set<String> results = new LinkedHashSet<String>(); private final Set<String> results = new LinkedHashSet<String>();
PrefixUpdaterSub prefixUpdaterSub = null; //PrefixUpdaterSub prefixUpdaterSub = null;
MethodAUpdaterSub methodAUpdaterSub = null; //MethodAUpdaterSub methodAUpdaterSub = null;
private ContentProviderClient client; private ContentProviderClient client;
@ -330,61 +330,55 @@ public class CategorizationFragment extends SherlockFragment{
return rootView; return rootView;
} }
final CountDownLatch latch = new CountDownLatch(1); private void requestSearchResults() {
class PrefixUpdaterSub extends PrefixUpdater { final CountDownLatch latch = new CountDownLatch(1);
public PrefixUpdaterSub() { Utils.executeAsyncTask(new PrefixUpdater(this) {
super(CategorizationFragment.this); @Override
} protected ArrayList<String> doInBackground(Void... voids) {
ArrayList<String> result = new ArrayList<String>();
@Override try {
protected ArrayList<String> doInBackground(Void... voids) { result = super.doInBackground();
ArrayList<String> result = new ArrayList<String>(); latch.await();
try { }
result = super.doInBackground(); catch (InterruptedException e) {
latch.await(); Log.w(TAG, e);
Thread.currentThread().interrupt();
}
return result;
} }
catch (InterruptedException e) {
Log.w(TAG, e); @Override
Thread.currentThread().interrupt(); protected void onPostExecute(ArrayList<String> result) {
super.onPostExecute(result);
results.addAll(result);
Log.d(TAG, "Prefix result: " + result);
categoriesAdapter.notifyDataSetChanged();
} }
return result; });
}
@Override Utils.executeAsyncTask(new MethodAUpdater(this) {
protected void onPostExecute(ArrayList<String> result) { @Override
super.onPostExecute(result); protected void onPostExecute(ArrayList<String> result) {
results.clear();
super.onPostExecute(result);
results.addAll(result); results.addAll(result);
Log.d(TAG, "Prefix result: " + result); Log.d(TAG, "Method A result: " + result);
categoriesAdapter.notifyDataSetChanged(); categoriesAdapter.notifyDataSetChanged();
}
}
latch.countDown();
class MethodAUpdaterSub extends MethodAUpdater { }
});
public MethodAUpdaterSub() {
super(CategorizationFragment.this);
}
@Override
protected void onPostExecute(ArrayList<String> result) {
results.clear();
super.onPostExecute(result);
results.addAll(result);
Log.d(TAG, "Method A result: " + result);
categoriesAdapter.notifyDataSetChanged();
latch.countDown();
}
} }
private void startUpdatingCategoryList() { private void startUpdatingCategoryList() {
if (prefixUpdaterSub != null) { requestSearchResults();
/*
if (prefixUpdater != null) {
prefixUpdaterSub.cancel(true); prefixUpdaterSub.cancel(true);
} }
@ -398,6 +392,7 @@ public class CategorizationFragment extends SherlockFragment{
Utils.executeAsyncTask(prefixUpdaterSub); Utils.executeAsyncTask(prefixUpdaterSub);
Utils.executeAsyncTask(methodAUpdaterSub); Utils.executeAsyncTask(methodAUpdaterSub);
Log.d(TAG, "Final results: " + results); Log.d(TAG, "Final results: " + results);
*/
} }