Merge pull request #306 from owncloud/fix/sample_client

Fix sample client

sample_client/build.gradle

@@ -10,6 +10,10 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 28
+
+        // This is pretty ugly but manifest placeholders don't seem to work very well when using different modules
+        // See https://github.com/openid/AppAuth-Android/issues/325
+        manifestPlaceholders = [appAuthRedirectScheme: '']
     }
 
     lintOptions {

sample_client/src/main/java/com/owncloud/android/lib/sampleclient/MainActivity.java

@@ -40,7 +40,7 @@ import android.widget.Toast;
 
 import com.owncloud.android.lib.common.OwnCloudClient;
 import com.owncloud.android.lib.common.OwnCloudClientFactory;
-import com.owncloud.android.lib.common.OwnCloudClientManagerFactory;
+import com.owncloud.android.lib.common.SingleSessionManager;
 import com.owncloud.android.lib.common.authentication.OwnCloudCredentialsFactory;
 import com.owncloud.android.lib.common.network.OnDatatransferProgressListener;
 import com.owncloud.android.lib.common.operations.OnRemoteOperationListener;
@@ -82,7 +82,7 @@ public class MainActivity extends Activity implements OnRemoteOperationListener,
 
         final Uri serverUri = Uri.parse(getString(R.string.server_base_url));
 
-        OwnCloudClientManagerFactory.setUserAgent(getUserAgent());
+        SingleSessionManager.setUserAgent(getUserAgent());
         mClient = OwnCloudClientFactory.createOwnCloudClient(serverUri, this, true);
 
         mClient.setCredentials(

wait_for_emulator.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-
-bootanim=""
-failcounter=0
-checkcounter=0
-until [[ "$bootanim" =~ "stopped" ]]; do
-   bootanim=`adb -e shell getprop init.svc.bootanim 2>&1`
-   echo "($checkcounter) $bootanim"
-   if [[ "$bootanim" =~ "not found" ]]; then
-      let "failcounter += 1"
-      if [[ $failcounter -gt 30 ]]; then
-        echo "Failed to start emulator"
-        exit 1
-      fi
-   fi
-   let "checkcounter += 1"
-   sleep 10
-done
-echo "Done"