From 09ff3ba4938d1ade474ee771a82103cba99ab20c Mon Sep 17 00:00:00 2001 From: Steve Soltys Date: Mon, 23 Oct 2017 20:01:27 -0400 Subject: [PATCH] Clean up packaging of content provider backup/restore components --- .../activity/backup/CreateBackupActivityController.java | 4 ++-- .../activity/restore/RestoreBackupActivityController.java | 4 ++-- .../provider/{backup => }/ContentProviderBackupComponent.java | 3 +-- .../provider/{backup => }/ContentProviderBackupState.java | 2 +- .../{restore => }/ContentProviderRestoreComponent.java | 3 +-- .../provider/{restore => }/ContentProviderRestoreState.java | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) rename app/src/main/java/com/stevesoltys/backup/transport/component/provider/{backup => }/ContentProviderBackupComponent.java (98%) rename app/src/main/java/com/stevesoltys/backup/transport/component/provider/{backup => }/ContentProviderBackupState.java (96%) rename app/src/main/java/com/stevesoltys/backup/transport/component/provider/{restore => }/ContentProviderRestoreComponent.java (98%) rename app/src/main/java/com/stevesoltys/backup/transport/component/provider/{restore => }/ContentProviderRestoreState.java (95%) diff --git a/app/src/main/java/com/stevesoltys/backup/activity/backup/CreateBackupActivityController.java b/app/src/main/java/com/stevesoltys/backup/activity/backup/CreateBackupActivityController.java index 4796edd7..bc076611 100644 --- a/app/src/main/java/com/stevesoltys/backup/activity/backup/CreateBackupActivityController.java +++ b/app/src/main/java/com/stevesoltys/backup/activity/backup/CreateBackupActivityController.java @@ -24,8 +24,8 @@ import com.stevesoltys.backup.transport.component.BackupComponent; import com.stevesoltys.backup.transport.component.RestoreComponent; import com.stevesoltys.backup.transport.component.provider.ContentProviderBackupConfiguration; import com.stevesoltys.backup.transport.component.provider.ContentProviderBackupConfigurationBuilder; -import com.stevesoltys.backup.transport.component.provider.backup.ContentProviderBackupComponent; -import com.stevesoltys.backup.transport.component.provider.restore.ContentProviderRestoreComponent; +import com.stevesoltys.backup.transport.component.provider.ContentProviderBackupComponent; +import com.stevesoltys.backup.transport.component.provider.ContentProviderRestoreComponent; import java.util.LinkedList; import java.util.List; diff --git a/app/src/main/java/com/stevesoltys/backup/activity/restore/RestoreBackupActivityController.java b/app/src/main/java/com/stevesoltys/backup/activity/restore/RestoreBackupActivityController.java index 03580319..d53838b1 100644 --- a/app/src/main/java/com/stevesoltys/backup/activity/restore/RestoreBackupActivityController.java +++ b/app/src/main/java/com/stevesoltys/backup/activity/restore/RestoreBackupActivityController.java @@ -25,8 +25,8 @@ import com.stevesoltys.backup.transport.component.BackupComponent; import com.stevesoltys.backup.transport.component.RestoreComponent; import com.stevesoltys.backup.transport.component.provider.ContentProviderBackupConfiguration; import com.stevesoltys.backup.transport.component.provider.ContentProviderBackupConfigurationBuilder; -import com.stevesoltys.backup.transport.component.provider.backup.ContentProviderBackupComponent; -import com.stevesoltys.backup.transport.component.provider.restore.ContentProviderRestoreComponent; +import com.stevesoltys.backup.transport.component.provider.ContentProviderBackupComponent; +import com.stevesoltys.backup.transport.component.provider.ContentProviderRestoreComponent; import libcore.io.IoUtils; import java.io.File; diff --git a/app/src/main/java/com/stevesoltys/backup/transport/component/provider/backup/ContentProviderBackupComponent.java b/app/src/main/java/com/stevesoltys/backup/transport/component/provider/ContentProviderBackupComponent.java similarity index 98% rename from app/src/main/java/com/stevesoltys/backup/transport/component/provider/backup/ContentProviderBackupComponent.java rename to app/src/main/java/com/stevesoltys/backup/transport/component/provider/ContentProviderBackupComponent.java index 24438656..0535e3f8 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/component/provider/backup/ContentProviderBackupComponent.java +++ b/app/src/main/java/com/stevesoltys/backup/transport/component/provider/ContentProviderBackupComponent.java @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.transport.component.provider.backup; +package com.stevesoltys.backup.transport.component.provider; import android.app.backup.BackupDataInput; import android.content.ContentResolver; @@ -7,7 +7,6 @@ import android.os.ParcelFileDescriptor; import android.util.Base64; import android.util.Log; import com.stevesoltys.backup.transport.component.BackupComponent; -import com.stevesoltys.backup.transport.component.provider.ContentProviderBackupConfiguration; import libcore.io.IoUtils; import sun.misc.IOUtils; diff --git a/app/src/main/java/com/stevesoltys/backup/transport/component/provider/backup/ContentProviderBackupState.java b/app/src/main/java/com/stevesoltys/backup/transport/component/provider/ContentProviderBackupState.java similarity index 96% rename from app/src/main/java/com/stevesoltys/backup/transport/component/provider/backup/ContentProviderBackupState.java rename to app/src/main/java/com/stevesoltys/backup/transport/component/provider/ContentProviderBackupState.java index 3a7f8ed8..3211550d 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/component/provider/backup/ContentProviderBackupState.java +++ b/app/src/main/java/com/stevesoltys/backup/transport/component/provider/ContentProviderBackupState.java @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.transport.component.provider.backup; +package com.stevesoltys.backup.transport.component.provider; import android.os.ParcelFileDescriptor; diff --git a/app/src/main/java/com/stevesoltys/backup/transport/component/provider/restore/ContentProviderRestoreComponent.java b/app/src/main/java/com/stevesoltys/backup/transport/component/provider/ContentProviderRestoreComponent.java similarity index 98% rename from app/src/main/java/com/stevesoltys/backup/transport/component/provider/restore/ContentProviderRestoreComponent.java rename to app/src/main/java/com/stevesoltys/backup/transport/component/provider/ContentProviderRestoreComponent.java index 75e51b9e..08b4dd02 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/component/provider/restore/ContentProviderRestoreComponent.java +++ b/app/src/main/java/com/stevesoltys/backup/transport/component/provider/ContentProviderRestoreComponent.java @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.transport.component.provider.restore; +package com.stevesoltys.backup.transport.component.provider; import android.app.backup.BackupDataOutput; import android.app.backup.RestoreDescription; @@ -10,7 +10,6 @@ import android.util.Base64; import android.util.Log; import com.android.internal.util.Preconditions; import com.stevesoltys.backup.transport.component.RestoreComponent; -import com.stevesoltys.backup.transport.component.provider.ContentProviderBackupConfiguration; import libcore.io.IoUtils; import libcore.io.Streams; diff --git a/app/src/main/java/com/stevesoltys/backup/transport/component/provider/restore/ContentProviderRestoreState.java b/app/src/main/java/com/stevesoltys/backup/transport/component/provider/ContentProviderRestoreState.java similarity index 95% rename from app/src/main/java/com/stevesoltys/backup/transport/component/provider/restore/ContentProviderRestoreState.java rename to app/src/main/java/com/stevesoltys/backup/transport/component/provider/ContentProviderRestoreState.java index 13b01814..e1f14164 100644 --- a/app/src/main/java/com/stevesoltys/backup/transport/component/provider/restore/ContentProviderRestoreState.java +++ b/app/src/main/java/com/stevesoltys/backup/transport/component/provider/ContentProviderRestoreState.java @@ -1,4 +1,4 @@ -package com.stevesoltys.backup.transport.component.provider.restore; +package com.stevesoltys.backup.transport.component.provider; import android.content.pm.PackageInfo; import android.os.ParcelFileDescriptor;