diff options
author | arne@gaia.fritz.box <arne@gaia.fritz.box> | 2012-12-25 23:22:13 +0100 |
---|---|---|
committer | arne@gaia.fritz.box <arne@gaia.fritz.box> | 2012-12-25 23:22:13 +0100 |
commit | 3018f292ff635d7ec61b3cd02a1e13659819683f (patch) | |
tree | 32de630e310e6055124ee92a0d5788a76f6cd94d /src/de/blinkt/openvpn/MainActivity.java | |
parent | 83dfeaa842bd42840698bdce9a91207a75395b3e (diff) | |
parent | 80d073d5fd79e0c57e33e708e6917e9f36c9bebc (diff) |
Merge local changes with repository
Diffstat (limited to 'src/de/blinkt/openvpn/MainActivity.java')
-rw-r--r-- | src/de/blinkt/openvpn/MainActivity.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/de/blinkt/openvpn/MainActivity.java b/src/de/blinkt/openvpn/MainActivity.java index 9b329817..32cf575b 100644 --- a/src/de/blinkt/openvpn/MainActivity.java +++ b/src/de/blinkt/openvpn/MainActivity.java @@ -1,8 +1,11 @@ package de.blinkt.openvpn; +import java.io.File; +import java.util.ArrayList; import java.util.List; import android.content.Intent; +import android.net.Uri; import android.preference.PreferenceActivity; public class MainActivity extends PreferenceActivity { @@ -19,6 +22,15 @@ public class MainActivity extends PreferenceActivity { translation.summary = translatedby; target.add(translation); } + + if(SendDumpActivity.getLastestDump(this)!=null) { + Header sendDump = new Header(); + sendDump.titleRes = R.string.send_minidump; + sendDump.summaryRes = R.string.send_minidump_summary; + sendDump.intent = new Intent(this,SendDumpActivity.class); + target.add(sendDump); + } + } @Override @@ -29,4 +41,6 @@ public class MainActivity extends PreferenceActivity { } + + } |