From 7efb77686920c025bdc961284c88e3867aa9d74c Mon Sep 17 00:00:00 2001
From: Arne Schwabe <arne@rfc2549.org>
Date: Sun, 6 Jul 2014 22:08:23 +0200
Subject: Include package name in send dump email

---
 main/src/main/java/de/blinkt/openvpn/api/ExternalOpenVPNService.java | 1 -
 main/src/main/java/de/blinkt/openvpn/fragments/SendDumpFragment.java | 2 +-
 main/src/main/res/layout/basic_settings.xml                          | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'main/src')

diff --git a/main/src/main/java/de/blinkt/openvpn/api/ExternalOpenVPNService.java b/main/src/main/java/de/blinkt/openvpn/api/ExternalOpenVPNService.java
index b572c098..82b9f060 100644
--- a/main/src/main/java/de/blinkt/openvpn/api/ExternalOpenVPNService.java
+++ b/main/src/main/java/de/blinkt/openvpn/api/ExternalOpenVPNService.java
@@ -111,7 +111,6 @@ public class ExternalOpenVPNService extends Service implements StateListener {
         public void startProfile(String profileUUID) throws RemoteException {
             checkOpenVPNPermission();
 
-
             VpnProfile vp = ProfileManager.get(getBaseContext(), profileUUID);
             VPNLaunchHelper.startOpenVpn(vp, getBaseContext());
         }
diff --git a/main/src/main/java/de/blinkt/openvpn/fragments/SendDumpFragment.java b/main/src/main/java/de/blinkt/openvpn/fragments/SendDumpFragment.java
index d43f6427..b4175f19 100644
--- a/main/src/main/java/de/blinkt/openvpn/fragments/SendDumpFragment.java
+++ b/main/src/main/java/de/blinkt/openvpn/fragments/SendDumpFragment.java
@@ -53,7 +53,7 @@ public class SendDumpFragment extends Fragment  {
 		}
 
 
-		emailIntent.putExtra(Intent.EXTRA_SUBJECT, String.format("%s %s Minidump",name,version));
+		emailIntent.putExtra(Intent.EXTRA_SUBJECT, String.format("%s(%s) %s Minidump",name, getActivity().getPackageName(), version));
 
 		emailIntent.putExtra(Intent.EXTRA_TEXT, "Please describe the issue you have experienced");
 
diff --git a/main/src/main/res/layout/basic_settings.xml b/main/src/main/res/layout/basic_settings.xml
index 86e0640e..c6192dc2 100644
--- a/main/src/main/res/layout/basic_settings.xml
+++ b/main/src/main/res/layout/basic_settings.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:blinkt="http://schemas.android.com/apk/res-auto"
+    xmlns:b linkt="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content" >
-- 
cgit v1.2.3