missytake/fdroiddata
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge commit 'refs/merge-requests/364' of gitorious.org:f-droid/fdroiddata

Browse source
This commit is contained in:
Daniel Martí 2014-01-27 13:35:03 +01:00
parent e54af54e80 48a495ae86
commit 42c163f648
2 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
metadata/org.wordpress.android.txt
View file

@ -111,9 +111,9 @@ Build:2.5.1,85
echo wp.GCM_ID="wordpress" >> local.properties
Build:2.6 RC 2,90
disable=Doesn't build - ApiHelper.java:412: cannot find symbol List<?>, see: https://github.com/wordpress-mobile/WordPress-Android/issues/678
commit=2.6-rc-2
gradle=yes
patch=list.patch
prebuild=cp local.properties-example local.properties && \
sed -e "/sdk.dir/ s#.*#sdk.dir=$$SDK$$#" -i local.properties

22
metadata/org.wordpress.android/list.patch Normal file
View file

@ -0,0 +1,22 @@
diff --git a/src/org/xmlrpc/android/ApiHelper.java b/src/org/xmlrpc/android/ApiHelper.java
index fcdd0b3..44e88a9 100644
--- a/src/org/xmlrpc/android/ApiHelper.java
+++ b/src/org/xmlrpc/android/ApiHelper.java
@@ -144,7 +144,7 @@ public class ApiHelper {
public void onSuccess();
}
- public static class GetPostFormatsTask extends HelperAsyncTask<List<?>, Void, Object> {
+ public static class GetPostFormatsTask extends HelperAsyncTask<java.util.List<?>, Void, Object> {
private Blog mBlog;
@Override
@@ -409,7 +409,7 @@ public class ApiHelper {
}
}
- public static class SyncMediaLibraryTask extends HelperAsyncTask<List<?>, Void, Integer> {
+ public static class SyncMediaLibraryTask extends HelperAsyncTask<java.util.List<?>, Void, Integer> {
public interface Callback extends GenericErrorCallback {
public void onSuccess(int results);
}