fix sample app

owncloud · Feb 16, 2020 · e9dd5c7 · e9dd5c7
1 parent 20430a5
commit e9dd5c7
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 23 deletions.
diff --git a/sample_client/build.gradle b/sample_client/build.gradle
@@ -5,11 +5,15 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 29
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 28
+        targetSdkVersion 29
+
+        // 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
@@ -40,7 +40,7 @@
 
 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 void onCreate(Bundle savedInstanceState) {
 
         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/settings.gradle b/settings.gradle
@@ -1,2 +1,4 @@
+rootProject.name = 'ownCloud library'
+
 include ':owncloudComLibrary'
 include ':sample_client'
diff --git a/wait_for_emulator.sh b/wait_for_emulator.sh