From edc17afa0a197d9887b375b697ea9df89729b215 Mon Sep 17 00:00:00 2001 From: Adam Jones Date: Fri, 24 Mar 2017 23:06:30 +0000 Subject: [PATCH] Remove unused classes --- .../java/fr/free/nrw/commons/api/MWApi.java | 8 --- .../contributions/MediaListAdapter.java | 66 ------------------- .../commons/media/CategoryImagesLoader.java | 59 ----------------- 3 files changed, 133 deletions(-) delete mode 100644 app/src/main/java/fr/free/nrw/commons/api/MWApi.java delete mode 100644 app/src/main/java/fr/free/nrw/commons/contributions/MediaListAdapter.java delete mode 100644 app/src/main/java/fr/free/nrw/commons/media/CategoryImagesLoader.java diff --git a/app/src/main/java/fr/free/nrw/commons/api/MWApi.java b/app/src/main/java/fr/free/nrw/commons/api/MWApi.java deleted file mode 100644 index c2d6d99f9..000000000 --- a/app/src/main/java/fr/free/nrw/commons/api/MWApi.java +++ /dev/null @@ -1,8 +0,0 @@ -package fr.free.nrw.commons.api; - -import com.android.volley.RequestQueue; - -public class MWApi { - private RequestQueue queue; - -} diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/MediaListAdapter.java b/app/src/main/java/fr/free/nrw/commons/contributions/MediaListAdapter.java deleted file mode 100644 index bd4e93a36..000000000 --- a/app/src/main/java/fr/free/nrw/commons/contributions/MediaListAdapter.java +++ /dev/null @@ -1,66 +0,0 @@ -package fr.free.nrw.commons.contributions; - -import android.app.Activity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; - -import java.util.ArrayList; - -import fr.free.nrw.commons.CommonsApplication; -import fr.free.nrw.commons.Media; -import fr.free.nrw.commons.R; - -public class MediaListAdapter extends BaseAdapter { - private ArrayList mediaList; - private Activity activity; - - public MediaListAdapter(Activity activity, ArrayList mediaList) { - this.mediaList = mediaList; - this.activity = activity; - } - - public void updateMediaList(ArrayList newMediaList) { - // FIXME: Hack for now, replace with something more efficient later on - for(Media newMedia: newMediaList) { - boolean isDuplicate = false; - for(Media oldMedia: mediaList ) { - if(newMedia.getFilename().equals(oldMedia.getFilename())) { - isDuplicate = true; - break; - } - } - if(!isDuplicate) { - mediaList.add(0, newMedia); - } - } - } - @Override - public int getCount() { - return mediaList.size(); - } - - @Override - public Object getItem(int i) { - return mediaList.get(i); - } - - @Override - public long getItemId(int i) { - return i; - } - - @Override - public View getView(int i, View view, ViewGroup viewGroup) { - if(view == null) { - view = activity.getLayoutInflater().inflate(R.layout.layout_contribution, null, false); - view.setTag(new ContributionViewHolder(view)); - } - - Media m = (Media) getItem(i); - ContributionViewHolder holder = (ContributionViewHolder) view.getTag(); - holder.imageView.setMedia(m, ((CommonsApplication)activity.getApplicationContext()).getImageLoader()); - holder.titleView.setText(m.getDisplayTitle()); - return view; - } -} diff --git a/app/src/main/java/fr/free/nrw/commons/media/CategoryImagesLoader.java b/app/src/main/java/fr/free/nrw/commons/media/CategoryImagesLoader.java deleted file mode 100644 index 6e9898ef1..000000000 --- a/app/src/main/java/fr/free/nrw/commons/media/CategoryImagesLoader.java +++ /dev/null @@ -1,59 +0,0 @@ -package fr.free.nrw.commons.media; - -import android.content.Context; -import android.support.v4.content.AsyncTaskLoader; -import android.util.Log; - -import org.mediawiki.api.ApiResult; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; - -import fr.free.nrw.commons.CommonsApplication; -import fr.free.nrw.commons.Media; -import fr.free.nrw.commons.Utils; - -public class CategoryImagesLoader extends AsyncTaskLoader>{ - private final CommonsApplication app; - private final String category; - - public CategoryImagesLoader(Context context, String category) { - super(context); - this.app = (CommonsApplication) context.getApplicationContext(); - this.category = category; - } - - @Override - protected void onStartLoading() { - super.onStartLoading(); - super.forceLoad(); - } - - @Override - public List loadInBackground() { - ArrayList mediaList = new ArrayList<>(); - ApiResult result; - try { - result = app.getApi().action("query") - .param("list", "categorymembers") - .param("cmtitle", "Category:" + category) - .param("cmprop", "title|timestamp") - .param("cmtype", "file") - .param("cmsort", "timestamp") - .param("cmdir", "descending") - .param("cmlimit", 50) - .get(); - } catch (IOException e) { - throw new RuntimeException(e); - } - - Log.d("Commons", Utils.getStringFromDOM(result.getDocument())); - - List members = result.getNodes("/api/query/categorymembers/cm"); - for(ApiResult member : members) { - mediaList.add(new Media(member.getString("@title"))); - } - return mediaList; - } -}