fix legacy sdk checks for pre-v14 sdks

src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -67,7 +67,6 @@ import android.widget.Toast;
 
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
-import com.owncloud.android.authentication.AccountAuthenticator;
 import com.owncloud.android.datamodel.OCFile;
 import com.owncloud.android.db.PreferenceManager;
 import com.owncloud.android.files.services.FileUploader;
@@ -254,25 +253,14 @@ public class ReceiveExternalFilesActivity extends FileActivity
             builder.setPositiveButton(R.string.uploader_wrn_no_account_setup_btn_text, new OnClickListener() {
                 @Override
                 public void onClick(DialogInterface dialog, int which) {
-                    if (android.os.Build.VERSION.SDK_INT >
-                        android.os.Build.VERSION_CODES.ECLAIR_MR1) {
-                        // using string value since in API7 this
-                        // constant is not defined
-                        // in API7 < this constant is defined in
-                        // Settings.ADD_ACCOUNT_SETTINGS
-                        // and Settings.EXTRA_AUTHORITIES
-                        Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT);
-                        intent.putExtra("authorities", new String[]{MainApp.getAuthTokenType()});
-                        startActivityForResult(intent, REQUEST_CODE__SETUP_ACCOUNT);
-                    } else {
-                        // since in API7 there is no direct call for
-                        // account setup, so we need to
-                        // show our own AccountSetupActivity, get
-                        // desired results and setup
-                        // everything for ourselves
-                        Intent intent = new Intent(getActivity().getBaseContext(), AccountAuthenticator.class);
-                        startActivityForResult(intent, REQUEST_CODE__SETUP_ACCOUNT);
-                    }
+                    // using string value since in API7 this
+                    // constant is not defined
+                    // in API7 < this constant is defined in
+                    // Settings.ADD_ACCOUNT_SETTINGS
+                    // and Settings.EXTRA_AUTHORITIES
+                    Intent intent = new Intent(android.provider.Settings.ACTION_ADD_ACCOUNT);
+                    intent.putExtra("authorities", new String[]{MainApp.getAuthTokenType()});
+                    startActivityForResult(intent, REQUEST_CODE__SETUP_ACCOUNT);
                 }
             });
             builder.setNegativeButton(R.string.uploader_wrn_no_account_quit_btn_text, new OnClickListener() {

src/main/java/com/owncloud/android/utils/DisplayUtils.java

@@ -233,26 +233,22 @@ public class DisplayUtils {
             dots = dots + ".";
         }
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD) {
-            // Find host name after '//' or '@'
-            int hostStart = 0;
-            if (urlNoDots.contains("//")) {
-                hostStart = url.indexOf("//") + "//".length();
-            } else if (url.contains("@")) {
-                hostStart = url.indexOf('@') + "@".length();
-            }
+        // Find host name after '//' or '@'
+        int hostStart = 0;
+        if (urlNoDots.contains("//")) {
+            hostStart = url.indexOf("//") + "//".length();
+        } else if (url.contains("@")) {
+            hostStart = url.indexOf('@') + "@".length();
+        }
 
-            int hostEnd = url.substring(hostStart).indexOf("/");
-            // Handle URL which doesn't have a path (path is implicitly '/')
-            hostEnd = (hostEnd == -1 ? urlNoDots.length() : hostStart + hostEnd);
+        int hostEnd = url.substring(hostStart).indexOf("/");
+        // Handle URL which doesn't have a path (path is implicitly '/')
+        hostEnd = (hostEnd == -1 ? urlNoDots.length() : hostStart + hostEnd);
 
-            String host = urlNoDots.substring(hostStart, hostEnd);
-            host = (toASCII ? IDN.toASCII(host) : IDN.toUnicode(host));
+        String host = urlNoDots.substring(hostStart, hostEnd);
+        host = (toASCII ? IDN.toASCII(host) : IDN.toUnicode(host));
 
-            return dots + urlNoDots.substring(0, hostStart) + host + urlNoDots.substring(hostEnd);
-        } else {
-            return dots + url;
-        }
+        return dots + urlNoDots.substring(0, hostStart) + host + urlNoDots.substring(hostEnd);
     }
 
     /**

src/main/java/third_parties/in/srain/cube/GridViewWithHeaderAndFooter.java

@@ -98,7 +98,7 @@ public class GridViewWithHeaderAndFooter extends GridView {
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
         ListAdapter adapter = getAdapter();
         if (adapter instanceof HeaderViewGridAdapter) {
-            ((HeaderViewGridAdapter) adapter).setNumColumns(getNumColumnsCompatible());
+            ((HeaderViewGridAdapter) adapter).setNumColumns(super.getNumColumns());
             invalidateRowHeight();
             ((HeaderViewGridAdapter) adapter).setRowHeight(getRowHeight());
         }
@@ -264,24 +264,6 @@ public class GridViewWithHeaderAndFooter extends GridView {
         }
     }
 
-    @TargetApi(11)
-    private int getNumColumnsCompatible() {
-        if (Build.VERSION.SDK_INT >= 11) {
-            return super.getNumColumns();
-        } else {
-            try {
-                Field numColumns = getClass().getSuperclass().getDeclaredField("mNumColumns");
-                numColumns.setAccessible(true);
-                return numColumns.getInt(this);
-            } catch (Exception e) {
-                if (mNumColumns != -1) {
-                    return mNumColumns;
-                }
-                throw new RuntimeException("Can not determine the mNumColumns for this API platform, please call setNumColumns to set it.");
-            }
-        }
-    }
-
     @TargetApi(16)
     private int getColumnWidthCompatible() {
         if (Build.VERSION.SDK_INT >= 16) {
@@ -312,7 +294,7 @@ public class GridViewWithHeaderAndFooter extends GridView {
             return mRowHeight;
         }
         ListAdapter adapter = getAdapter();
-        int numColumns = getNumColumnsCompatible();
+        int numColumns = super.getNumColumns();
 
         // adapter has not been set or has no views in it;
         if (adapter == null || adapter.getCount() <= numColumns * (mHeaderViewInfos.size() + mFooterViewInfos.size())) {
@@ -335,31 +317,21 @@ public class GridViewWithHeaderAndFooter extends GridView {
         return mRowHeight;
     }
 
-    @TargetApi(11)
     public void tryToScrollToBottomSmoothly() {
         int lastPos = getAdapter().getCount() - 1;
-        if (Build.VERSION.SDK_INT >= 11) {
-            smoothScrollToPositionFromTop(lastPos, 0);
-        } else {
-            setSelection(lastPos);
-        }
+        smoothScrollToPositionFromTop(lastPos, 0);
     }
 
-    @TargetApi(11)
     public void tryToScrollToBottomSmoothly(int duration) {
         int lastPos = getAdapter().getCount() - 1;
-        if (Build.VERSION.SDK_INT >= 11) {
-            smoothScrollToPositionFromTop(lastPos, 0, duration);
-        } else {
-            setSelection(lastPos);
-        }
+        smoothScrollToPositionFromTop(lastPos, 0, duration);
     }
 
     @Override
     public void setAdapter(ListAdapter adapter) {
         if (mHeaderViewInfos.size() > 0 || mFooterViewInfos.size() > 0) {
             HeaderViewGridAdapter headerViewGridAdapter = new HeaderViewGridAdapter(mHeaderViewInfos, mFooterViewInfos, adapter);
-            int numColumns = getNumColumnsCompatible();
+            int numColumns = super.getNumColumns();
             if (numColumns > 1) {
                 headerViewGridAdapter.setNumColumns(numColumns);
             }

src/main/java/third_parties/michaelOrtiz/TouchImageViewCustom.java

@@ -1181,24 +1181,17 @@ public class TouchImageViewCustom extends ImageViewCustom {
 		}
     }
     
-    @TargetApi(Build.VERSION_CODES.GINGERBREAD)
 	private class CompatScroller {
     	Scroller scroller;
     	OverScroller overScroller;
     	boolean isPreGingerbread;
-    	
-    	public CompatScroller(Context context) {
-    		if (VERSION.SDK_INT < VERSION_CODES.GINGERBREAD) {
-    			isPreGingerbread = true;
-    			scroller = new Scroller(context);
-    			
-    		} else {
-    			isPreGingerbread = false;
-    			overScroller = new OverScroller(context);
-    		}
-    	}
-    	
-    	public void fling(int startX, int startY, int velocityX, int velocityY, int minX, int maxX, int minY, int maxY) {
+
+        public CompatScroller(Context context) {
+            isPreGingerbread = false;
+            overScroller = new OverScroller(context);
+        }
+
+        public void fling(int startX, int startY, int velocityX, int velocityY, int minX, int maxX, int minY, int maxY) {
     		if (isPreGingerbread) {
     			scroller.fling(startX, startY, velocityX, velocityY, minX, maxX, minY, maxY);
     		} else {