From f030963c9e9b8e349db5ba959dddb7e0089be7f7 Mon Sep 17 00:00:00 2001
From: arrase <arrase@gmail.com>
Date: Tue, 22 Nov 2016 22:37:34 +0100
Subject: [PATCH] refactor

---
 .../java/org/torproject/android/OrbotMainActivity.java     | 4 ++--
 .../HiddenServiceUtils.java => backup/BackupUtils.java}    | 7 +++----
 .../java/org/torproject/android/{zip => backup}/ZipIt.java | 2 +-
 .../torproject/android/ui/hs/HiddenServicesActivity.java   | 4 +---
 .../torproject/android/ui/hs/dialogs/HSActionsDialog.java  | 4 ++--
 5 files changed, 9 insertions(+), 12 deletions(-)
 rename app/src/main/java/org/torproject/android/{hsutils/HiddenServiceUtils.java => backup/BackupUtils.java} (87%)
 rename app/src/main/java/org/torproject/android/{zip => backup}/ZipIt.java (98%)

diff --git a/app/src/main/java/org/torproject/android/OrbotMainActivity.java b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
index 6d58d0ed..e0fdbb0f 100644
--- a/app/src/main/java/org/torproject/android/OrbotMainActivity.java
+++ b/app/src/main/java/org/torproject/android/OrbotMainActivity.java
@@ -29,7 +29,7 @@ import org.torproject.android.ui.PromoAppsActivity;
 import org.torproject.android.ui.Rotate3dAnimation;
 import org.torproject.android.ui.hs.providers.HSContentProvider;
 import org.torproject.android.vpn.VPNEnableActivity;
-import org.torproject.android.hsutils.HiddenServiceUtils;
+import org.torproject.android.backup.BackupUtils;
 
 import android.annotation.SuppressLint;
 import android.app.ActivityManager;
@@ -646,7 +646,7 @@ public class OrbotMainActivity extends AppCompatActivity
 						Cursor onion = getContentResolver().query(HSContentProvider.CONTENT_URI, mProjection, "port=" + hsPort, null, null);
 						if(onion != null) {
 							hostname = onion.getString(onion.getColumnIndex(HSContentProvider.HiddenService.NAME));
-							HiddenServiceUtils hsutils = new HiddenServiceUtils(getApplicationContext());
+							BackupUtils hsutils = new BackupUtils(getApplicationContext());
 							if(keyZipPath != null && keyZipPath.length() > 0)
 							{
 								hsutils.restoreOnionBackup(hsPort, keyZipPath);
diff --git a/app/src/main/java/org/torproject/android/hsutils/HiddenServiceUtils.java b/app/src/main/java/org/torproject/android/backup/BackupUtils.java
similarity index 87%
rename from app/src/main/java/org/torproject/android/hsutils/HiddenServiceUtils.java
rename to app/src/main/java/org/torproject/android/backup/BackupUtils.java
index 0cf359b0..42c98f8a 100644
--- a/app/src/main/java/org/torproject/android/hsutils/HiddenServiceUtils.java
+++ b/app/src/main/java/org/torproject/android/backup/BackupUtils.java
@@ -1,18 +1,17 @@
-package org.torproject.android.hsutils;
+package org.torproject.android.backup;
 
 import android.app.Application;
 import android.content.Context;
 
 import org.torproject.android.service.TorServiceConstants;
 import org.torproject.android.storage.ExternalStorage;
-import org.torproject.android.zip.ZipIt;
 
 import java.io.File;
 
-public class HiddenServiceUtils {
+public class BackupUtils {
     private static File appCacheHome;
 
-    public HiddenServiceUtils(Context context) {
+    public BackupUtils(Context context) {
         appCacheHome = context.getDir(TorServiceConstants.DIRECTORY_TOR_DATA, Application.MODE_PRIVATE);
     }
 
diff --git a/app/src/main/java/org/torproject/android/zip/ZipIt.java b/app/src/main/java/org/torproject/android/backup/ZipIt.java
similarity index 98%
rename from app/src/main/java/org/torproject/android/zip/ZipIt.java
rename to app/src/main/java/org/torproject/android/backup/ZipIt.java
index 84a0b7a6..bde29f09 100644
--- a/app/src/main/java/org/torproject/android/zip/ZipIt.java
+++ b/app/src/main/java/org/torproject/android/backup/ZipIt.java
@@ -1,4 +1,4 @@
-package org.torproject.android.zip;
+package org.torproject.android.backup;
 
 
 import java.io.BufferedInputStream;
diff --git a/app/src/main/java/org/torproject/android/ui/hs/HiddenServicesActivity.java b/app/src/main/java/org/torproject/android/ui/hs/HiddenServicesActivity.java
index a10c3e21..52103dcc 100644
--- a/app/src/main/java/org/torproject/android/ui/hs/HiddenServicesActivity.java
+++ b/app/src/main/java/org/torproject/android/ui/hs/HiddenServicesActivity.java
@@ -58,9 +58,7 @@ public class HiddenServicesActivity extends AppCompatActivity {
 
         mAdapter = new OnionListAdapter(
                 this,
-                mCR.query(
-                        HSContentProvider.CONTENT_URI, mProjection, mWhere, null, null
-                ),
+                mCR.query(HSContentProvider.CONTENT_URI, mProjection, mWhere, null, null),
                 0
         );
 
diff --git a/app/src/main/java/org/torproject/android/ui/hs/dialogs/HSActionsDialog.java b/app/src/main/java/org/torproject/android/ui/hs/dialogs/HSActionsDialog.java
index 52ea6c5f..f432a018 100644
--- a/app/src/main/java/org/torproject/android/ui/hs/dialogs/HSActionsDialog.java
+++ b/app/src/main/java/org/torproject/android/ui/hs/dialogs/HSActionsDialog.java
@@ -22,7 +22,7 @@ import android.widget.Button;
 import android.widget.Toast;
 
 import org.torproject.android.R;
-import org.torproject.android.hsutils.HiddenServiceUtils;
+import org.torproject.android.backup.BackupUtils;
 import org.torproject.android.ui.hs.providers.HSContentProvider;
 
 public class HSActionsDialog extends DialogFragment {
@@ -49,7 +49,7 @@ public class HSActionsDialog extends DialogFragment {
                     return;
                 }
 
-                HiddenServiceUtils hsutils = new HiddenServiceUtils(mContext);
+                BackupUtils hsutils = new BackupUtils(mContext);
                 String backupPath = hsutils.createOnionBackup(Integer.parseInt(arguments.getString("port")));
 
                 if (backupPath == null || backupPath.length() < 1) {