From e3bb3c4b3abf192320d453939a2436710b61f105 Mon Sep 17 00:00:00 2001
From: David Black <david8black@gmail.com>
Date: Wed, 17 Apr 2013 16:13:50 +0100
Subject: [PATCH] update com.showmehills to 0.30

---
 metadata/com.showmehills.txt             | 42 +++++++++++++-----------
 metadata/com.showmehills/analytics.patch | 33 +++++++++++++++++++
 2 files changed, 56 insertions(+), 19 deletions(-)
 create mode 100644 metadata/com.showmehills/analytics.patch

diff --git a/metadata/com.showmehills.txt b/metadata/com.showmehills.txt
index c00e1fdb74..318c035024 100644
--- a/metadata/com.showmehills.txt
+++ b/metadata/com.showmehills.txt
@@ -1,7 +1,4 @@
-#NonFreeDep can be removed with the Manifest patch below
-#NonFreeDep because it requires google maps, Tracking because acra is enabled
-#by default, although it can be turned off in preferences
-AntiFeatures:NonFreeDep,Tracking
+AntiFeatures:Tracking
 Category:Navigation
 License:GPLv3
 Web Site:https://github.com/ShowMeHills/ShowMeHills/wiki
@@ -11,14 +8,18 @@ Issue Tracker:https://github.com/ShowMeHills/ShowMeHills/issues
 Summary:Augmented reality mountain identification
 Description:
 Augmented reality application which overlays the names of hills and mountains
-on a camera view. Data for hills of the UK and Ireland is better than that of the rest of the world.
+on a camera view. The supplied data for hills of the UK and Ireland is 
+better than that for the rest of the world.
 
-N.B The "birds eye", map overlay mode won't work because the only map source is Google Maps and there
-isn't an API key in the source code.
+'''N.B''' Although it is not necessary (since v0.30) to have Google 
+Maps installed to install the app, attempting to view the peaks on the 
+map if you don't have Google maps installed, will crash the app.
+Even if you have that installed the  "birds eye", map overlay mode won't work 
+because the only map source is Google Maps and there isn't an API key in the 
+source code.
 
-Anti-feature: Dependencies. It's necessary for Google Maps to be already
-installed either as an app or as a shared system library for this app to be
-installable. We will be able to remove this dependency soon.
+Anti-feature: Tracking. Crash reports are sent without interaction.
+Google Analytics was removed before building.
 .
 
 Repo Type:git
@@ -39,15 +40,18 @@ Build Version:0.24,24,v0.24,update=no,subdir=ShowMe/ShowMeHills,prebuild=\
 mkdir src && \
 echo "sdk.dir=$$SDK$$" >local.properties && \
 echo "sdk.dir=$$SDK$$" >../ShowMeX/local.properties
+Build Version:0.30,30,v0.30,patch=analytics.patch,\
+update=no,srclibs=NoAnalytics@158a4a,\
+subdir=ShowMe/ShowMeHills,rm=ShowMe/ShowMeX/libs/libGoogleAnalyticsV2.jar,prebuild=\
+mkdir src && echo "sdk.dir=$$SDK$$" >local.properties && \
+echo "android.library.reference.1=$$NoAnalytics$$" >> ../ShowMeX/project.properties && \
+echo "sdk.dir=$$SDK$$" >../ShowMeX/local.properties && \
+sed -i 's/<uses-library android:name="com.google.android.maps" \/>\
+/<uses-library android:name="com.google.android.maps" \
+android:required="false" \/>/g' AndroidManifest.xml
 
-#Attempting to view the peaks on the map if you don't have Google maps installed, will crash the app
-#Build Version:0.24,24,v0.24,update=no,subdir=ShowMe/ShowMeHills,prebuild=\
-#mkdir src && \
-#echo "sdk.dir=$$SDK$$" >local.properties && \
-#echo "sdk.dir=$$SDK$$" >../ShowMeX/local.properties && \
-#sed -i 's/<uses-library android:name="com.google.android.maps" \/>/<uses-library android:name="com.google.android.maps" android:required="false" \/>/g' AndroidManifest.xml
 Auto Update Mode:None
-Update Check Mode:Market
-Current Version:0.29
-Current Version Code:29
+Update Check Mode:Tags
+Current Version:0.30
+Current Version Code:30
 
diff --git a/metadata/com.showmehills/analytics.patch b/metadata/com.showmehills/analytics.patch
new file mode 100644
index 0000000000..06afe86668
--- /dev/null
+++ b/metadata/com.showmehills/analytics.patch
@@ -0,0 +1,33 @@
+Remove extra Google Analytics
+
+diff --git a/ShowMe/ShowMeX/src/com/showmehills/ShowMeHillsActivity.java b/ShowMe/ShowMeX/src/com/showmehills/ShowMeHillsActivity.java
+index 95fe190..a9a8125 100644
+--- a/ShowMe/ShowMeX/src/com/showmehills/ShowMeHillsActivity.java
++++ b/ShowMe/ShowMeX/src/com/showmehills/ShowMeHillsActivity.java
+@@ -48,8 +48,6 @@ import org.apache.http.client.methods.HttpGet;
+ import org.apache.http.client.methods.HttpPost;
+ import org.apache.http.impl.client.DefaultHttpClient;
+ 
+-import com.google.analytics.tracking.android.EasyTracker;
+-import com.google.analytics.tracking.android.Tracker;
+ import com.showmehills.R;
+ 
+ import android.app.Activity;
+@@ -231,8 +229,6 @@ public class ShowMeHillsActivity extends Activity implements IShowMeHillsActivit
+ 		}
+ 		super.onStop();
+ 
+-	    EasyTracker.getInstance().activityStop(this); // Add this method.
+-
+ 	}
+ 
+ 	@Override
+@@ -240,8 +236,6 @@ public class ShowMeHillsActivity extends Activity implements IShowMeHillsActivit
+ 
+ 		super.onCreate(savedInstanceState);
+ 
+-	    EasyTracker.getInstance().activityStart(this); // Add this method.
+-
+         requestWindowFeature(Window.FEATURE_NO_TITLE);
+         getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+