Merge pull request #2040 from owncloud/release_2.5.0

Release 2.5.0

Author: davigonz

CHANGELOG.md

@@ -1,3 +1,12 @@
+## 2.5.0 (October 2017)
+- OAuth2 support
+- Show file listing option (anonymous upload) when sharing a folder (OC X required)
+- First approach to fix instant uploads
+- UI improvements, including:
+  + Hide share icon when resharing is forbidden
+  + Improve feedback when uploading infected files
+- Bug fixes
+
 ## 2.4.0 (May 2017)
 - Video streaming
 - Multiple public links per file (OC X required)

androidTest/java/com/owncloud/android/ui/activity/PublicShareActivityTest.java

@@ -687,6 +687,7 @@ public void test_12_remove_multiple_links()
      *  TEST CASE: Check permalink
      *  PASSED IF: Link to the item in clipboard
      */
+    /* Disabled until https://github.com/owncloud/android/issues/2032 is done
     @Test
     public void test_13_permalink()
             throws InterruptedException, NoSuchFieldException, IllegalArgumentException, IllegalAccessException {
@@ -718,7 +719,7 @@ public void test_13_permalink()
         Log_OC.i(LOG_TAG, "Test Permalink Passed");
 
     }
-
+    */
 
     /**
      *  TEST CASE: Capability "Allow public links" disabled

build.gradle

@@ -89,8 +89,8 @@ android {
 
     defaultConfig {
 
-        manifestPlaceholders.versionCode = "20400000"
-        manifestPlaceholders.versionName = "2.4.0"
+        manifestPlaceholders.versionCode = "20500000"
+        manifestPlaceholders.versionName = "2.5.0"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
@@ -229,7 +229,14 @@ def setOutputFileName(variant, appName, callerProject) {
         newName += callerProject.archivesBaseName
     }
 
-    newName += "_$variant.buildType.manifestPlaceholders.versionName"
+    def versionName = "$variant.mergedFlavor.versionName"
+    if (variant.mergedFlavor.manifestPlaceholders.versionName != null) {
+        versionName = "$variant.mergedFlavor.manifestPlaceholders.versionName"
+    }
+    if (variant.buildType.manifestPlaceholders.versionName != null) {
+        versionName = "$variant.buildType.manifestPlaceholders.versionName"
+    }
+    newName += "_$versionName"
 
     def buildNumber = System.env.OC_BUILD_NUMBER
     if (buildNumber) {

oc_jb_workaround/AndroidManifest.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.owncloud.android.workaround.accounts"
-    android:versionCode="0100035"
-    android:versionName="1.0.35" >
+    >
 
     <uses-sdk
         android:minSdkVersion="16"

oc_jb_workaround/build.gradle

@@ -8,6 +8,11 @@ android {
     compileSdkVersion 24
     buildToolsVersion '25.0.2'
 
+    defaultConfig {
+        versionCode = 100036
+        versionName = "1.0.36"
+    }
+
     sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'

res/layout/share_file_layout.xml

@@ -77,7 +77,8 @@
                 android:layout_height="36dp"
                 android:layout_alignParentRight="true"
                 android:padding="@dimen/standard_half_padding"
-                android:src="@drawable/copy_link" />
+                android:src="@drawable/copy_link"
+                android:visibility="invisible"/>
 
         </RelativeLayout>
 

res/xml/users_and_groups_searchable.xml

@@ -24,5 +24,5 @@
     android:hint="@string/search_users_and_groups_hint"
     android:searchSuggestAuthority="@string/search_suggest_authority"
     android:searchSuggestIntentAction="@string/search_suggest_intent_action"
-    android:searchSuggestThreshold="1" >
+    android:searchSuggestThreshold="4" >
 </searchable>

src/com/owncloud/android/authentication/AuthenticatorActivity.java

@@ -1374,11 +1374,34 @@ public void onAuthenticatorTaskCallback(RemoteOperationResult result) {
             String username = ((UserInfo) result.getData().get(0)).mId;
 
             if (mAction == ACTION_CREATE) {
-                mUsernameInput.setText(username);
+
+                if (!BASIC_TOKEN_TYPE.equals(mAuthTokenType)) {
+                    mUsernameInput.setText(username);
+                }
+
                 success = createAccount(result);
 
             } else {
-                success = updateAccount(username);
+
+                try {
+
+                    if (BASIC_TOKEN_TYPE.equals(mAuthTokenType)) {
+
+                        updateAccountAuthentication();
+                        success = true;
+
+                    } else {
+
+                        success = updateAccount(username);
+                    }
+
+                } catch (AccountNotFoundException e) {
+                    Log_OC.e(TAG, "Account " + mAccount + " was removed!", e);
+                    Toast.makeText(this, R.string.auth_account_does_not_exist,
+                            Toast.LENGTH_SHORT).show();
+                    // do not use a Snackbar, finishing right now!
+                    finish();
+                }
             }
 
             if (success) {
@@ -1534,6 +1557,7 @@ private boolean updateAccount(String username) {
         boolean success = false;
 
         RemoteOperationResult result;
+
         if (!mUsernameInput.getText().toString().trim().equals(username)) {
             // fail - not a new account, but an existing one; disallow
             result = new RemoteOperationResult(ResultCode.ACCOUNT_NOT_THE_SAME);

src/com/owncloud/android/providers/UsersAndGroupsSearchProvider.java

@@ -71,7 +71,7 @@ public class UsersAndGroupsSearchProvider extends ContentProvider {
 
     private static final int SEARCH = 1;
 
-    private static final int RESULTS_PER_PAGE = 50;
+    private static final int RESULTS_PER_PAGE = 30;
     private static final int REQUESTED_PAGE = 1;
 
     public static final String CONTENT = "content";
@@ -163,7 +163,6 @@ public Cursor query(Uri uri, String[] projection, String selection, String[] sel
     private Cursor searchForUsersOrGroups(Uri uri) {
         MatrixCursor response = null;
 
-
         String userQuery = uri.getLastPathSegment().toLowerCase();
 
 

src/com/owncloud/android/ui/fragment/ShareFileFragment.java

@@ -204,6 +204,9 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         }
 
         // Private link button
+        /*
+        Disabled until https://github.com/owncloud/android/issues/2032 is done
+
         ImageView getPrivateLinkButton = (ImageView) view.findViewById(R.id.getPrivateLinkButton);
 
         getPrivateLinkButton.setOnClickListener(new View.OnClickListener() {
@@ -221,6 +224,7 @@ public boolean onLongClick(View view) {
                 return true;
             }
         });
+        */
 
         OwnCloudVersion serverVersion = AccountUtils.getServerVersion(mAccount);
         final boolean shareWithUsersEnable = (serverVersion != null && serverVersion.isSearchUsersSupported());