Better backwards compatibility in crash logger and images preview

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index debad1c..d9ec9af 100644 (file)
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -18,7 +18,7 @@
  -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r
  -->\r
 <manifest package="eu.alefzero.owncloud"\r
     android:versionCode="1"\r

-    android:versionName="0.1.150B" xmlns:android="http://schemas.android.com/apk/res/android">\r
+    android:versionName="0.1.151B" xmlns:android="http://schemas.android.com/apk/res/android">\r

 \r
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r
 \r
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />\r
     <uses-permission android:name="android.permission.USE_CREDENTIALS" />\r

diff --git a/src/eu/alefzero/owncloud/CrashHandler.java b/src/eu/alefzero/owncloud/CrashHandler.java
index 9106008..99cd044 100644 (file)
--- 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());
             
             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!");
             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 a8f0d81..8abf569 100644 (file)
--- 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
                             }\r
                                 Display display = getActivity().getWindowManager().getDefaultDisplay();\r
                                 Point size = new Point();\r
                             }\r
                                 Display display = getActivity().getWindowManager().getDefaultDisplay();\r
                                 Point size = new Point();\r

-                                display.getSize(size);\r
-                                int screenwidth = size.x;\r
+                                int screenwidth;\r
+                                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB_MR2) {\r
+                                    display.getSize(size);\r
+                                    screenwidth = size.x;\r
+                                } else {\r
+                                    screenwidth = display.getWidth();\r
+                                }\r

 \r
                                 Log.e("ASD", "W " + width + " SW " + screenwidth);\r
 \r
 \r
                                 Log.e("ASD", "W " + width + " SW " + screenwidth);\r
 \r