From e343a720f70e7abafc47ff66038fad35e72856e3 Mon Sep 17 00:00:00 2001
From: davigonz <dgonzalez@solidgear.es>
Date: Tue, 18 Feb 2020 12:07:33 +0100
Subject: [PATCH] Fix sample client

---
 sample_client/build.gradle                    |  4 ++++
 .../lib/sampleclient/MainActivity.java        |  4 ++--
 wait_for_emulator.sh                          | 19 -------------------
 3 files changed, 6 insertions(+), 21 deletions(-)
 delete mode 100644 wait_for_emulator.sh

diff --git a/sample_client/build.gradle b/sample_client/build.gradle
index b41ff109..4d0c1d4b 100644
--- a/sample_client/build.gradle
+++ b/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 {
diff --git a/sample_client/src/main/java/com/owncloud/android/lib/sampleclient/MainActivity.java b/sample_client/src/main/java/com/owncloud/android/lib/sampleclient/MainActivity.java
index eeec3947..5439e0ca 100644
--- a/sample_client/src/main/java/com/owncloud/android/lib/sampleclient/MainActivity.java
+++ b/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(
diff --git a/wait_for_emulator.sh b/wait_for_emulator.sh
deleted file mode 100644
index 7f6443c7..00000000
--- a/wait_for_emulator.sh
+++ /dev/null
@@ -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"