From 85cbeb46d371b96af0034f08e2e323d3bc202c49 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Tue, 2 Jul 2013 22:54:28 -0600
Subject: Move AboutFragment into leapclient package

---
 src/se/leap/leapclient/AboutFragment.java       | 65 +++++++++++++++++++++++++
 src/se/leap/leapclient/ConfigurationWizard.java |  1 -
 src/se/leap/leapclient/Dashboard.java           |  1 -
 3 files changed, 65 insertions(+), 2 deletions(-)
 create mode 100644 src/se/leap/leapclient/AboutFragment.java

(limited to 'src/se/leap/leapclient')

diff --git a/src/se/leap/leapclient/AboutFragment.java b/src/se/leap/leapclient/AboutFragment.java
new file mode 100644
index 00000000..9c7f31f0
--- /dev/null
+++ b/src/se/leap/leapclient/AboutFragment.java
@@ -0,0 +1,65 @@
+package se.leap.leapclient;
+
+import android.app.Fragment;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager.NameNotFoundException;
+import android.os.Bundle;
+import android.text.Html;
+import android.text.Spanned;
+import android.text.method.LinkMovementMethod;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import se.leap.leapclient.R;
+
+public class AboutFragment extends Fragment  {
+
+	public static Fragment newInstance() {
+		AboutFragment provider_detail_fragment = new AboutFragment();
+		return provider_detail_fragment;
+	}
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+       
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+    		Bundle savedInstanceState) {
+    	View v= inflater.inflate(R.layout.about, container, false);
+    	TextView ver = (TextView) v.findViewById(R.id.version);
+    	
+    	String version;
+    	String name="Openvpn";
+		try {
+			PackageInfo packageinfo = getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0);
+			version = packageinfo.versionName;
+			name = getString(R.string.app);
+		} catch (NameNotFoundException e) {
+			version = "error fetching version";
+		}
+
+    	
+    	ver.setText(getString(R.string.version_info,name,version));
+    	
+    	TextView paypal = (TextView) v.findViewById(R.id.donatestring);
+    	
+    	String donatetext = getActivity().getString(R.string.donatewithpaypal);
+    	Spanned htmltext = Html.fromHtml(donatetext);
+    	paypal.setText(htmltext);
+    	paypal.setMovementMethod(LinkMovementMethod.getInstance());
+    	
+    	TextView translation = (TextView) v.findViewById(R.id.translation);
+    	
+    	// Don't print a text for myself
+    	if ( getString(R.string.translationby).contains("Arne Schwabe"))
+    		translation.setText("");
+    	else
+    		translation.setText(R.string.translationby);
+    	return v;
+    }
+
+}
diff --git a/src/se/leap/leapclient/ConfigurationWizard.java b/src/se/leap/leapclient/ConfigurationWizard.java
index d12fdc77..2687b579 100644
--- a/src/se/leap/leapclient/ConfigurationWizard.java
+++ b/src/se/leap/leapclient/ConfigurationWizard.java
@@ -9,7 +9,6 @@ import org.json.JSONObject;
 import se.leap.leapclient.ProviderAPIResultReceiver.Receiver;
 import se.leap.leapclient.ProviderListContent.ProviderItem;
 import se.leap.leapclient.R;
-import se.leap.openvpn.AboutFragment;
 import se.leap.openvpn.MainActivity;
 import android.app.Activity;
 import android.app.DialogFragment;
diff --git a/src/se/leap/leapclient/Dashboard.java b/src/se/leap/leapclient/Dashboard.java
index a429d3b3..1b6b8e38 100644
--- a/src/se/leap/leapclient/Dashboard.java
+++ b/src/se/leap/leapclient/Dashboard.java
@@ -6,7 +6,6 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import se.leap.leapclient.ProviderAPIResultReceiver.Receiver;
-import se.leap.openvpn.AboutFragment;
 import se.leap.openvpn.LogWindow;
 import se.leap.openvpn.MainActivity;
 import se.leap.openvpn.OpenVPN;
-- 
cgit v1.2.3


From b358f7883257fdf2c5ca391ce7dcc51ff28f6266 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Thu, 4 Jul 2013 08:41:32 -0600
Subject: Clean up AboutFragment, remove donation text

---
 src/se/leap/leapclient/AboutFragment.java | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'src/se/leap/leapclient')

diff --git a/src/se/leap/leapclient/AboutFragment.java b/src/se/leap/leapclient/AboutFragment.java
index 9c7f31f0..a3fbbf93 100644
--- a/src/se/leap/leapclient/AboutFragment.java
+++ b/src/se/leap/leapclient/AboutFragment.java
@@ -45,13 +45,6 @@ public class AboutFragment extends Fragment  {
     	
     	ver.setText(getString(R.string.version_info,name,version));
     	
-    	TextView paypal = (TextView) v.findViewById(R.id.donatestring);
-    	
-    	String donatetext = getActivity().getString(R.string.donatewithpaypal);
-    	Spanned htmltext = Html.fromHtml(donatetext);
-    	paypal.setText(htmltext);
-    	paypal.setMovementMethod(LinkMovementMethod.getInstance());
-    	
     	TextView translation = (TextView) v.findViewById(R.id.translation);
     	
     	// Don't print a text for myself
-- 
cgit v1.2.3