From 759f82ea67e2058dcaac49bdb36934036e177f6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Blin?=
<sebastien.blin@savoirfairelinux.com>
Date: Wed, 14 Apr 2021 16:16:50 -0400
Subject: [PATCH] api: remove unused importAccounts exportAccounts
Change-Id: Id149688a7d5ff13d75c02901787e74a9eb5bbde3
---
.../java/cx/ring/service/DRingService.java | 10 -------
.../java/cx/ring/service/IDRingService.aidl | 3 --
.../java/cx/ring/services/AccountService.java | 28 -------------------
3 files changed, 41 deletions(-)
diff --git a/ring-android/app/src/main/java/cx/ring/service/DRingService.java b/ring-android/app/src/main/java/cx/ring/service/DRingService.java
index de82310d5..482b24065 100644
--- a/ring-android/app/src/main/java/cx/ring/service/DRingService.java
+++ b/ring-android/app/src/main/java/cx/ring/service/DRingService.java
@@ -487,16 +487,6 @@ public class DRingService extends Service {
}
- @Override
- public int backupAccounts(final List accountIDs, final String toDir, final String password) {
- return mAccountService.backupAccounts(accountIDs, toDir, password);
- }
-
- @Override
- public int restoreAccounts(final String archivePath, final String password) {
- return mAccountService.restoreAccounts(archivePath, password);
- }
-
@Override
public void connectivityChanged() {
mHardwareService.connectivityChanged(mPreferencesService.hasNetworkConnected());
diff --git a/ring-android/app/src/main/java/cx/ring/service/IDRingService.aidl b/ring-android/app/src/main/java/cx/ring/service/IDRingService.aidl
index e29b1ad7a..9ba51241d 100644
--- a/ring-android/app/src/main/java/cx/ring/service/IDRingService.aidl
+++ b/ring-android/app/src/main/java/cx/ring/service/IDRingService.aidl
@@ -114,8 +114,5 @@ interface IDRingService {
Map getConference(in String id);
- int backupAccounts(in List accountIDs, in String toDir, in String password);
- int restoreAccounts(in String archivePath, in String password);
-
void connectivityChanged();
}
diff --git a/ring-android/libringclient/src/main/java/cx/ring/services/AccountService.java b/ring-android/libringclient/src/main/java/cx/ring/services/AccountService.java
index 9a12a7212..3b6195dbc 100644
--- a/ring-android/libringclient/src/main/java/cx/ring/services/AccountService.java
+++ b/ring-android/libringclient/src/main/java/cx/ring/services/AccountService.java
@@ -972,34 +972,6 @@ public class AccountService {
mExecutor.execute(this::registerAllAccounts);
}
- /**
- * Backs up all the accounts into to an archive in the path
- */
- public int backupAccounts(final List<String> accountIds, final String toDir, final String password) {
- try {
- return mExecutor.submit(() -> {
- StringVect ids = new StringVect();
- ids.addAll(accountIds);
- return Ringservice.exportAccounts(ids, toDir, password);
- }).get();
- } catch (Exception e) {
- Log.e(TAG, "Error running backupAccounts()", e);
- }
- return 1;
- }
-
- /**
- * Restores the saved accounts from a path
- */
- public int restoreAccounts(final String archivePath, final String password) {
- try {
- return mExecutor.submit(() -> Ringservice.importAccounts(archivePath, password)).get();
- } catch (Exception e) {
- Log.e(TAG, "Error running restoreAccounts()", e);
- }
- return 1;
- }
-
/**
* Registers a new name on the blockchain for the account
*/
--
GitLab