fixes after and revert back to master lib

build.gradle

@@ -209,9 +209,9 @@ dependencies {
     // dependencies for app building
     implementation 'com.android.support:multidex:1.0.3'
 //    implementation project('nextcloud-android-library')
-    genericImplementation "com.github.nextcloud:android-library:hasPreviewProperty-SNAPSHOT"
-    gplayImplementation "com.github.nextcloud:android-library:hasPreviewProperty-SNAPSHOT"
-    versionDevImplementation "com.github.nextcloud:android-library:hasPreviewProperty-SNAPSHOT" // use always latest master
+    genericImplementation "com.github.nextcloud:android-library:master-SNAPSHOT"
+    gplayImplementation "com.github.nextcloud:android-library:master-SNAPSHOT"
+    versionDevImplementation "com.github.nextcloud:android-library:master-SNAPSHOT" // use always latest master
     implementation 'com.android.support.constraint:constraint-layout:1.1.3'
     implementation "com.android.support:support-v4:${supportLibraryVersion}"
     implementation "com.android.support:design:${supportLibraryVersion}"

src/gplay/java/com/owncloud/android/utils/PushUtils.java

@@ -395,19 +395,11 @@ public final class PushUtils {
                 PreferenceManager.setKeysMigration(context, true);
             } else {
                 if (oldPrivateKeyFile.exists()) {
-                    try {
-                        FileStorageUtils.moveFile(oldPrivateKeyFile, privateKeyFile);
-                    } catch (IOException e) {
-                        Log.e(TAG, "Failed to move old private key to new location");
-                    }
+                    FileStorageUtils.moveFile(oldPrivateKeyFile, privateKeyFile);
                 }
 
                 if (oldPublicKeyFile.exists()) {
-                    try {
-                        FileStorageUtils.moveFile(oldPublicKeyFile, publicKeyFile);
-                    } catch (IOException e) {
-                        Log.e(TAG, "Failed to move old public key to new location");
-                    }
+                    FileStorageUtils.moveFile(oldPublicKeyFile, publicKeyFile);
                 }
 
                 if (privateKeyFile.exists() && publicKeyFile.exists()) {