Enable preemptive authentication to avoid double send of files in uploading

[pub/Android/ownCloud.git] / src / eu / alefzero / owncloud / CrashHandler.java

diff --git a/src/eu/alefzero/owncloud/CrashHandler.java b/src/eu/alefzero/owncloud/CrashHandler.java
index ffad248..99cd044 100644 (file)
--- a/src/eu/alefzero/owncloud/CrashHandler.java
+++ b/src/eu/alefzero/owncloud/CrashHandler.java
@@ -37,6 +37,7 @@ import android.app.AlarmManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.PackageInfo;
 import android.net.ConnectivityManager;
 import android.os.Environment;
 import android.util.Log;
@@ -91,11 +92,13 @@ public class CrashHandler implements UncaughtExceptionHandler {
         String crash_filename = crash_filename_template + System.currentTimeMillis() + ".txt";
         File crashfile = new File(ocdir, crash_filename);
         try {
+            PackageInfo pi = mContext.getPackageManager().getPackageInfo(mContext.getPackageName(), 0);
             ConnectivityManager cm = (ConnectivityManager) mContext.getSystemService(Context.CONNECTIVITY_SERVICE);
-            String header = String.format("Model: %s, SDK: %d, Current net: %s\n\n",
+            String header = String.format("Model: %s, SDK: %d, Current net: %s AppVersion: %s\n\n",
                                           android.os.Build.MODEL,
                                           android.os.Build.VERSION.SDK_INT,
-                                          cm.getActiveNetworkInfo() != null ? cm.getActiveNetworkInfo().getTypeName() : "NONE");
+                                          cm.getActiveNetworkInfo() != null ? cm.getActiveNetworkInfo().getTypeName() : "NONE",
+                                          pi.versionName);
             Account account = AccountUtils.getCurrentOwnCloudAccount(mContext);
             AccountManager am = AccountManager.get(mContext);
             String header2 = String.format("Account: %s, OCUrl: %s, OCVersion: %s\n\n",
@@ -126,7 +129,12 @@ public class CrashHandler implements UncaughtExceptionHandler {
             
             Intent dataintent = new Intent(mContext, CrashlogSendActivity.class);
             dataintent.putExtra(KEY_CRASH_FILENAME, crashfile.getAbsolutePath());
-            PendingIntent intent = PendingIntent.getActivity(mContext.getApplicationContext(), 0, dataintent, Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+            PendingIntent intent;
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) {
+                intent = PendingIntent.getActivity(mContext.getApplicationContext(), 0, dataintent, Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+            } else {
+                intent = PendingIntent.getActivity(mContext.getApplicationContext(), 0, dataintent, Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
+            }
             AlarmManager mngr = (AlarmManager)mContext.getSystemService(Context.ALARM_SERVICE);
             if (mngr == null) {
                 Log.e(TAG, "Couldn't retrieve alarm manager!");