diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index cc0fbe67..e77b0e49 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,131 +1,131 @@
 <?xml version='1.0' encoding='utf-8'?>
-<manifest package="org.qtproject.example" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
+<manifest package="org.kde.ringkde" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="1" android:installLocation="auto">
     <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="ring-kde">
         <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|layoutDirection|locale|fontScale|keyboard|keyboardHidden|navigation|mcc|mnc|density"
-                  android:name="org.qtproject.qt5.android.bindings.QtActivity"
-                  android:label="ring-kde"
+                  android:name="org.kde.ringkde.Ringkde"
+                  android:label="Ring-KDE"
                   android:screenOrientation="unspecified"
                   android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
 
             <!-- Application arguments -->
             <!-- meta-data android:name="android.app.arguments" android:value="arg1 arg2 arg3"/ -->
             <!-- Application arguments -->
 
             <meta-data android:name="android.app.lib_name" android:value="ring-kde"/>
             <meta-data android:name="android.app.qt_sources_resource_id" android:resource="@array/qt_sources"/>
             <meta-data android:name="android.app.repository" android:value="default"/>
             <meta-data android:name="android.app.qt_libs_resource_id" android:resource="@array/qt_libs"/>
             <meta-data android:name="android.app.bundled_libs_resource_id" android:resource="@array/bundled_libs"/>
             <!-- Deploy Qt libs as part of package -->
             <meta-data android:name="android.app.bundle_local_qt_libs" android:value="-- %%BUNDLE_LOCAL_QT_LIBS%% --"/>
             <meta-data android:name="android.app.bundled_in_lib_resource_id" android:resource="@array/bundled_in_lib"/>
             <meta-data android:name="android.app.bundled_in_assets_resource_id" android:resource="@array/bundled_in_assets"/>
             <!-- Run with local libs -->
             <meta-data android:name="android.app.use_local_qt_libs" android:value="-- %%USE_LOCAL_QT_LIBS%% --"/>
             <meta-data android:name="android.app.libs_prefix" android:value="/data/local/tmp/qt/"/>
             <meta-data android:name="android.app.load_local_libs" android:value="-- %%INSERT_LOCAL_LIBS%% --"/>
             <meta-data android:name="android.app.load_local_jars" android:value="-- %%INSERT_LOCAL_JARS%% --"/>
             <meta-data android:name="android.app.static_init_classes" android:value="-- %%INSERT_INIT_CLASSES%% --"/>
             <!-- Used to specify custom system library path to run with local system libs -->
             <!-- <meta-data android:name="android.app.system_libs_prefix" android:value="/system/lib/"/> -->
             <!--  Messages maps -->
             <meta-data android:value="@string/ministro_not_found_msg" android:name="android.app.ministro_not_found_msg"/>
             <meta-data android:value="@string/ministro_needed_msg" android:name="android.app.ministro_needed_msg"/>
             <meta-data android:value="@string/fatal_error_msg" android:name="android.app.fatal_error_msg"/>
             <!--  Messages maps -->
 
             <!-- Splash screen -->
             <!-- meta-data android:name="android.app.splash_screen_drawable" android:resource="@drawable/logo"/ -->
             <!-- meta-data android:name="android.app.splash_screen_sticky" android:value="true"/ -->
             <!-- Splash screen -->
 
             <!-- Background running -->
             <!-- Warning: changing this value to true may cause unexpected crashes if the
                           application still try to draw after
                           "applicationStateChanged(Qt::ApplicationSuspended)"
                           signal is sent! -->
             <meta-data android:name="android.app.background_running" android:value="false"/>
             <!-- Background running -->
 
             <!-- auto screen scale factor -->
             <meta-data android:name="android.app.auto_screen_scale_factor" android:value="false"/>
             <!-- auto screen scale factor -->
 
             <!-- extract android style -->
             <!-- available android:values :
                 * default - In most cases this will be the same as "full", but it can also be something else if needed, e.g., for compatibility reasons
                 * full - useful QWidget & Quick Controls 1 apps
                 * minimal - useful for Quick Controls 2 apps, it is much faster than "full"
                 * none - useful for apps that don't use any of the above Qt modules
                 -->
             <meta-data android:name="android.app.extract_android_style" android:value="default"/>
             <!-- extract android style -->
     </activity>
 
     <!-- For adding service(s) please check: https://wiki.qt.io/AndroidServices -->
 
     </application>
 
     <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="28"/>
     <supports-screens android:largeScreens="true" android:normalScreens="true" android:anyDensity="true" android:smallScreens="true"/>
 
     <!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
          Remove the comment if you do not require these default permissions. -->
     <!-- %%INSERT_PERMISSIONS -->
 
         <uses-permission android:name="android.permission.INTERNET" />
         <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
         <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
         <uses-permission android:name="android.permission.ACCESS_BACKGROUND_SERVICE" />
         <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
         <uses-permission android:name="android.permission.RECORD_AUDIO" />
         <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
         <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />
         <uses-permission android:name="android.permission.CALL_PHONE" />
         <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
         <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
         <uses-permission android:name="android.permission.READ_CONTACTS" />
         <uses-permission android:name="android.permission.READ_PROFILE" />
         <uses-permission android:name="android.permission.BLUETOOTH" />
         <uses-permission android:name="android.permission.VIBRATE" />
         <uses-permission android:name="android.permission.WAKE_LOCK" />
         <uses-permission android:name="android.permission.CAMERA" />
         <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
         <uses-permission android:name="android.permission.READ_PHONE_STATE" />
         <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
         <uses-feature
             android:name="android.hardware.wifi"
             android:required="true" />
         <uses-feature
             android:name="android.hardware.telephony"
             android:required="false" />
         <uses-feature
             android:name="android.hardware.microphone"
             android:required="false" />
         <uses-feature
             android:name="android.hardware.bluetooth"
             android:required="false" />
         <uses-feature
             android:name="android.software.leanback"
             android:required="false" />
         <uses-feature
             android:name="android.hardware.camera"
             android:required="false" />
         <uses-feature
             android:name="android.hardware.touchscreen"
             android:required="false" />
         <uses-feature
             android:name="android.hardware.usb.host"
             android:required="false" />
 
 
     <!-- The following comment will be replaced upon deployment with default features based on the dependencies of the application.
          Remove the comment if you do not require these default features. -->
     <!-- %%INSERT_FEATURES -->
 
 </manifest>
diff --git a/android/src/org/kde/ringkde/Ringkde.java b/android/src/org/kde/ringkde/Ringkde.java
new file mode 100644
index 00000000..01ce0a0e
--- /dev/null
+++ b/android/src/org/kde/ringkde/Ringkde.java
@@ -0,0 +1,37 @@
+package org.kde.ringkde;
+
+import org.qtproject.qt5.android.bindings.QtActivity;
+import org.qtproject.qt5.android.bindings.QtApplication;
+import android.util.Log;
+import android.content.Context;
+import android.os.Bundle;
+import android.media.AudioAttributes;
+import java.util.Locale;
+import java.lang.String;
+
+public class Ringkde extends QtActivity
+{
+    public Ringkde()
+    {
+    }
+
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+            super.onCreate(savedInstanceState);
+    }
+
+    public void onInit(int status)
+    {
+    }
+
+    @Override
+    protected void onDestroy() {
+            super.onDestroy();
+            /*if (m_tts != null) {
+                m_tts.shutdown();
+            }*/
+    }
+
+}
+
diff --git a/cmake/FetchRingQt.cmake b/cmake/FetchRingQt.cmake
index 08377ad3..d7be210b 100644
--- a/cmake/FetchRingQt.cmake
+++ b/cmake/FetchRingQt.cmake
@@ -1,102 +1,102 @@
 # In case dring and LibRingQt are not found, fetch them from git and curl to
 # setup a minimal environment capable of building Ring-KDE. It also enable
 # static libraries to isolate Ring-KDE from any potential LRC API break.
 #
 # Ring-GNOME also enable static libraries for the same reason. This module
 # doesn't produce a "ready to use" binary. The daemon is still a separate
 # process. Single binary Ring isn't officially supported on Linux and sending
 # patches to keep it working upstream will only annoy its maintainer before
 # being ignored.
 
 CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
 
 find_package(Git REQUIRED)
 include(ExternalProject)
 
 message(STATUS "Manually downloading the missing dependencies")
 message(STATUS "Install them properly if you prefer to build without a network connection")
 
 # Fetch the XMLs
 set(XML_PATH ${CMAKE_CURRENT_BINARY_DIR}/xml/)
 
 if(${ENABLE_LIBWRAP})
     message(STATUS "Direct linking of libjami is enabled, skipping the XML detection")
 else()
     message(STATUS "Checking for the DBus interface XMLs in ${XML_PATH}")
 
     if (EXISTS ${XML_PATH}/cx.ring.Ring.CallManager.xml)
         message(STATUS "CallManager.xml found in ${XML_PATH}")
     endif()
 endif()
 
 if (NOT EXISTS ${XML_PATH}/cx.ring.Ring.CallManager.xml AND NOT ENABLE_LIBWRAP)
 
     message(STATUS "Downloading the GNU Ring API definition")
 
     file(DOWNLOAD https://raw.githubusercontent.com/savoirfairelinux/ring-daemon/master/bin/dbus/cx.ring.Ring.CallManager.xml
         ${XML_PATH}cx.ring.Ring.CallManager.xml INACTIVITY_TIMEOUT 30)
 
     file(DOWNLOAD https://raw.githubusercontent.com/savoirfairelinux/ring-daemon/master/bin/dbus/cx.ring.Ring.ConfigurationManager.xml
         ${XML_PATH}cx.ring.Ring.ConfigurationManager.xml INACTIVITY_TIMEOUT 30)
 
     file(DOWNLOAD https://raw.githubusercontent.com/savoirfairelinux/ring-daemon/master/bin/dbus/cx.ring.Ring.Instance.xml
         ${XML_PATH}cx.ring.Ring.Instance.xml INACTIVITY_TIMEOUT 30)
 
     file(DOWNLOAD https://raw.githubusercontent.com/savoirfairelinux/ring-daemon/master/bin/dbus/cx.ring.Ring.PresenceManager.xml
         ${XML_PATH}cx.ring.Ring.PresenceManager.xml INACTIVITY_TIMEOUT 30)
 
     file(DOWNLOAD https://raw.githubusercontent.com/savoirfairelinux/ring-daemon/master/bin/dbus/cx.ring.Ring.VideoManager.xml
         ${XML_PATH}cx.ring.Ring.VideoManager.xml INACTIVITY_TIMEOUT 30)
 
     file(DOWNLOAD https://raw.githubusercontent.com/savoirfairelinux/ring-daemon/master/bin/dbus/cx.ring.Ring.VideoManager.xml
         ${XML_PATH}cx.ring.Ring.VideoManager.xml INACTIVITY_TIMEOUT 30)
 
     # Fetch the constants
     file(DOWNLOAD https://raw.githubusercontent.com/savoirfairelinux/ring-daemon/master/src/dring/def.h
         ${CMAKE_CURRENT_BINARY_DIR}/dring/def.h INACTIVITY_TIMEOUT 30)
 
     file(DOWNLOAD https://raw.githubusercontent.com/savoirfairelinux/ring-daemon/master/src/dring/dring.h
         ${CMAKE_CURRENT_BINARY_DIR}/dring/dring.h INACTIVITY_TIMEOUT 30)
 
     file(DOWNLOAD https://raw.githubusercontent.com/savoirfairelinux/ring-daemon/master/src/dring/account_const.h
         ${CMAKE_CURRENT_BINARY_DIR}/dring/account_const.h INACTIVITY_TIMEOUT 30)
 
     file(DOWNLOAD https://raw.githubusercontent.com/savoirfairelinux/ring-daemon/master/src/dring/security_const.h
         ${CMAKE_CURRENT_BINARY_DIR}/dring/security_const.h INACTIVITY_TIMEOUT 30)
 
     file(DOWNLOAD https://raw.githubusercontent.com/savoirfairelinux/ring-daemon/master/src/dring/media_const.h
         ${CMAKE_CURRENT_BINARY_DIR}/dring/media_const.h INACTIVITY_TIMEOUT 30)
 
     file(DOWNLOAD https://raw.githubusercontent.com/savoirfairelinux/ring-daemon/master/src/dring/call_const.h
         ${CMAKE_CURRENT_BINARY_DIR}/dring/call_const.h INACTIVITY_TIMEOUT 30)
 
     file(DOWNLOAD https://raw.githubusercontent.com/savoirfairelinux/ring-daemon/master/src/dring/presence_const.h
         ${CMAKE_CURRENT_BINARY_DIR}/dring/presence_const.h INACTIVITY_TIMEOUT 30)
 endif()
 
 message(STATUS "Fetching LibRingQt from GitHub")
 
 if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/libringqt)
     execute_process(COMMAND
         git clone https://github.com/Elv13/libringqt.git --branch master ${CMAKE_CURRENT_BINARY_DIR}/libringqt
     )
 else()
-    execute_process(COMMAND
-        /bin/sh -c "cd ${CMAKE_CURRENT_BINARY_DIR}/libringqt && git fetch origin && git reset --hard origin/master"
-    )
+#    execute_process(COMMAND
+#        /bin/sh -c "cd ${CMAKE_CURRENT_BINARY_DIR}/libringqt && git fetch origin && git reset --hard origin/master"
+#    )
 endif()
 
 if (NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/libkquickitemviews)
     execute_process(COMMAND
         git clone  http://anongit.kde.org/kquickitemviews/ --branch master ${CMAKE_CURRENT_BINARY_DIR}/libkquickitemviews
     )
 else()
     execute_process(COMMAND
         /bin/sh -c "cd ${CMAKE_CURRENT_BINARY_DIR}/libkquickitemviews && git fetch origin && git reset --hard origin/master"
     )
 endif()
 
 # Build LibRingQt
 SET(RING_XML_INTERFACES_DIR ${XML_PATH})
 
 SET(ring_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}/dring/)