From: David A. Velasco <dvelasco@solidgear.es>
Date: Mon, 9 Jul 2012 07:39:32 +0000 (+0200)
Subject: Better backwards compatibility in crash logger and images preview
X-Git-Tag: oc-android-1.4.3~300
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/146f7969b3be30754aca10395fa39f68928a392e?hp=-c

Better backwards compatibility in crash logger and images preview
---

146f7969b3be30754aca10395fa39f68928a392e
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index debad1c8..d9ec9af9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
  -->
 <manifest package="eu.alefzero.owncloud"
     android:versionCode="1"
-    android:versionName="0.1.150B" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:versionName="0.1.151B" xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />
diff --git a/src/eu/alefzero/owncloud/CrashHandler.java b/src/eu/alefzero/owncloud/CrashHandler.java
index 9106008f..99cd0444 100644
--- a/src/eu/alefzero/owncloud/CrashHandler.java
+++ b/src/eu/alefzero/owncloud/CrashHandler.java
@@ -129,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!");
diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
index a8f0d812..8abf5696 100644
--- a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
@@ -292,8 +292,13 @@ public class FileDetailFragment extends SherlockFragment implements
                             }
                                 Display display = getActivity().getWindowManager().getDefaultDisplay();
                                 Point size = new Point();
-                                display.getSize(size);
-                                int screenwidth = size.x;
+                                int screenwidth;
+                                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB_MR2) {
+                                    display.getSize(size);
+                                    screenwidth = size.x;
+                                } else {
+                                    screenwidth = display.getWidth();
+                                }
 
                                 Log.e("ASD", "W " + width + " SW " + screenwidth);