fix migration from old to new encryption

apps/files_encryption/hooks/hooks.php

@@ -81,8 +81,6 @@ class Hooks {
 				$session->setLegacyKey( $plainLegacyKey );
 			
 			}
-
-			$publicKey = Keymanager::getPublicKey( $view, $params['uid'] );
 			
 			// Encrypt existing user files:
 			// This serves to upgrade old versions of the encryption

apps/files_encryption/lib/crypt.php

@@ -613,7 +613,7 @@ class Crypt
 
 		$decrypted = $bf->decrypt( $content );
 
-		return rtrim( $decrypted, "\0" );;
+		return $decrypted;
 
 	}