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

metadata/org.mariotaku.twidere.txt

@@ -104,6 +104,16 @@ Build:0.2.9.1,78
     commit=0.2.9.1
     prebuild=rm -rf dist/ art/
 
+Build:0.2.9.3,79
+    commit=0.2.9.3
+	init=rm libs/android-support-v13.jar
+	extlibs=android/android-support-v4.jar;android/android-support-v13.jar
+	srclibs=1:ActionBar-PullToRefresh@v0.9.1;2:drag-sort-listview@0.6.1;3:SlidingMenu@7ebe32772
+	prebuild=rm -rf dist/ art/ src/org/mariotaku/twidere/fragment/support/NativeMapFragment.java && \
+			 cp libs/android-support-v4.jar $$SlidingMenu$$/libs/ && \
+			 cp libs/android-support-v4.jar $$drag-sort-listview$$/libs/
+	patch=GooglePlay.patch
+
 Auto Update Mode:None
 Update Check Mode:Tags
 Current Version:0.2.9.3

metadata/org.mariotaku.twidere/GooglePlay.patch

@@ -0,0 +1,43 @@
+diff --git a/project.properties b/project.properties
+index 79a96c4..910deaf 100644
+--- a/project.properties
++++ b/project.properties
+@@ -13,4 +13,3 @@ target=android-19
+ android.library.reference.1=../ActionBar-PullToRefresh
+ android.library.reference.2=../drag-sort-listview
+ android.library.reference.3=../SlidingMenu
+-android.library.reference.4=../google-play-services_lib
+diff --git a/src/org/mariotaku/twidere/activity/MapViewerActivity.java b/src/org/mariotaku/twidere/activity/MapViewerActivity.java
+index 23e9fc7..d8d5a3f 100644
+--- a/src/org/mariotaku/twidere/activity/MapViewerActivity.java
++++ b/src/org/mariotaku/twidere/activity/MapViewerActivity.java
+@@ -26,13 +26,9 @@ import android.support.v4.app.FragmentTransaction;
+ import android.view.Menu;
+ import android.view.MenuItem;
+ 
+-import com.google.android.gms.common.ConnectionResult;
+-import com.google.android.gms.common.GooglePlayServicesUtil;
+-
+ import org.mariotaku.twidere.Constants;
+ import org.mariotaku.twidere.R;
+ import org.mariotaku.twidere.activity.support.TwidereSwipeBackActivity;
+-import org.mariotaku.twidere.fragment.support.NativeMapFragment;
+ import org.mariotaku.twidere.fragment.support.WebMapFragment;
+ import org.mariotaku.twidere.util.MapInterface;
+ import org.mariotaku.twidere.util.ThemeUtils;
+@@ -92,13 +88,13 @@ public class MapViewerActivity extends TwidereSwipeBackActivity implements Const
+ 			finish();
+ 			return;
+ 		}
+-		final Fragment fragment = isNativeMapSupported() ? new NativeMapFragment() : new WebMapFragment();
++		final Fragment fragment = new WebMapFragment();
+ 		fragment.setArguments(bundle);
+ 		final FragmentTransaction ft = getSupportFragmentManager().beginTransaction();
+ 		ft.replace(android.R.id.content, fragment).commit();
+ 	}
+ 
+ 	private boolean isNativeMapSupported() {
+-		return GooglePlayServicesUtil.isGooglePlayServicesAvailable(this) == ConnectionResult.SUCCESS;
++		return false;
+ 	}
+ }

srclibs/ActionBar-PullToRefresh.txt

@@ -0,0 +1,7 @@
+Repo Type:git
+Repo:https://github.com/chrisbanes/ActionBar-PullToRefresh.git
+
+Subdir:library
+
+Update Project:Yes
+

srclibs/drag-sort-listview.txt

@@ -0,0 +1,7 @@
+Repo Type:git
+Repo:https://github.com/bauerca/drag-sort-listview.git
+
+Subdir:library
+
+Update Project:Yes
+