Filter only '/' character in user input when version of server is 8.1 or later

[pub/Android/ownCloud.git] / src / com / owncloud / android / utils / DisplayUtils.java

diff --git a/src/com/owncloud/android/utils/DisplayUtils.java b/src/com/owncloud/android/utils/DisplayUtils.java
index 91dfc47..7030c87 100644 (file)
--- a/src/com/owncloud/android/utils/DisplayUtils.java
+++ b/src/com/owncloud/android/utils/DisplayUtils.java
@@ -33,9 +33,12 @@ import java.util.Set;
 import java.util.Vector;\r
 \r
 import android.annotation.TargetApi;\r
+import android.app.Activity;\r
 import android.content.Context;\r
+import android.graphics.Point;\r
 import android.os.Build;\r
 import android.text.format.DateUtils;\r
+import android.view.Display;\r
 import android.webkit.MimeTypeMap;\r
 \r
 import com.owncloud.android.MainApp;\r
@@ -350,4 +353,24 @@ public class DisplayUtils {
         return path;\r
     }\r
 \r
+\r
+    /**\r
+     * Gets the screen size in pixels in a backwards compatible way\r
+     *\r
+     * @param caller        Activity calling; needed to get access to the {@link android.view.WindowManager}\r
+     * @return              Size in pixels of the screen, or default {@link Point} if caller is null\r
+     */\r
+    public static Point getScreenSize(Activity caller) {\r
+        Point size = new Point();\r
+        if (caller != null) {\r
+            Display display = caller.getWindowManager().getDefaultDisplay();\r
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB_MR2) {\r
+                display.getSize(size);\r
+            } else {\r
+                size.set(display.getWidth(), display.getHeight());\r
+            }\r
+        }\r
+        return size;\r
+    }\r
+\r
 }\r