diff --git a/app/build.gradle b/app/build.gradle
index 5bd313052..347527622 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -332,6 +332,9 @@ dependencies {
 
     // implementation 'androidx.activity:activity-ktx:1.4.0'
     implementation project(':material-color-utilities')
+
+    //
+    implementation 'com.github.nextcloud:android-common:d11641e7b1992aab3b571127388012057755e439'
 }
 
 task installGitHooks(type: Copy, group: "development") {
diff --git a/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt
index fe115f100..f71122240 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt
@@ -31,6 +31,7 @@ import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import autodagger.AutoInjector
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.nextcloud.android.common.SampleLibraryClass
 import com.nextcloud.talk.R
 import com.nextcloud.talk.application.NextcloudTalkApplication
 import com.nextcloud.talk.events.CertificateEvent
@@ -68,6 +69,9 @@ open class BaseActivity : AppCompatActivity() {
 
     public override fun onResume() {
         super.onResume()
+        // TODO remove this, testing only
+        SampleLibraryClass()
+
         if (appPreferences.isScreenSecured) {
             window.addFlags(WindowManager.LayoutParams.FLAG_SECURE)
         } else {
diff --git a/settings.gradle b/settings.gradle
index 794d972f1..e3cb2629e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -20,3 +20,8 @@
 
 include ':app'
 include ':material-color-utilities'
+includeBuild('../android-common') {
+    dependencySubstitution {
+        substitute module('com.github.nextcloud:android-common') using project(':core')
+    }
+}