android: Move TrustedCertificateEntry to a new package

diff --git a/src/frontends/android/src/org/strongswan/android/data/TrustedCertificateEntry.java b/src/frontends/android/src/org/strongswan/android/security/TrustedCertificateEntry.java
similarity index 98%
rename from src/frontends/android/src/org/strongswan/android/data/TrustedCertificateEntry.java
rename to src/frontends/android/src/org/strongswan/android/security/TrustedCertificateEntry.java
index de7ea32b429a5c3f20d8191be91886ec0a9da5b6..143741faf792b34ab2e6b61ae8d2fa470010914c 100644 (file)
--- a/src/frontends/android/src/org/strongswan/android/data/TrustedCertificateEntry.java
+++ b/src/frontends/android/src/org/strongswan/android/security/TrustedCertificateEntry.java
@@ -13,7 +13,7 @@
  * for more details.
  */
 
-package org.strongswan.android.data;
+package org.strongswan.android.security;
 
 import java.security.cert.X509Certificate;
 

diff --git a/src/frontends/android/src/org/strongswan/android/ui/TrustedCertificateListFragment.java b/src/frontends/android/src/org/strongswan/android/ui/TrustedCertificateListFragment.java
index 4e8e0ddeb75a160df12563cdd6fbc310014d5cc4..2f07b96c2dcf049bd37be2e69c74bfb1c8e80335 100644 (file)
--- a/src/frontends/android/src/org/strongswan/android/ui/TrustedCertificateListFragment.java
+++ b/src/frontends/android/src/org/strongswan/android/ui/TrustedCertificateListFragment.java
@@ -23,8 +23,8 @@ import java.util.List;
 import java.util.Map.Entry;
 
 import org.strongswan.android.R;
-import org.strongswan.android.data.TrustedCertificateEntry;
 import org.strongswan.android.logic.TrustedCertificateManager;
+import org.strongswan.android.security.TrustedCertificateEntry;
 import org.strongswan.android.ui.adapter.TrustedCertificateAdapter;
 
 import android.app.Activity;

diff --git a/src/frontends/android/src/org/strongswan/android/ui/TrustedCertificatesActivity.java b/src/frontends/android/src/org/strongswan/android/ui/TrustedCertificatesActivity.java
index 967d25a02a136b42ca10d70fd9b94025bd7c6f7e..2874207e82d0bbcfa1fcf45520939cab0e297896 100644 (file)
--- a/src/frontends/android/src/org/strongswan/android/ui/TrustedCertificatesActivity.java
+++ b/src/frontends/android/src/org/strongswan/android/ui/TrustedCertificatesActivity.java
@@ -16,8 +16,8 @@
 package org.strongswan.android.ui;
 
 import org.strongswan.android.R;
-import org.strongswan.android.data.TrustedCertificateEntry;
 import org.strongswan.android.data.VpnProfileDataSource;
+import org.strongswan.android.security.TrustedCertificateEntry;
 
 import android.app.ActionBar;
 import android.app.ActionBar.Tab;

diff --git a/src/frontends/android/src/org/strongswan/android/ui/VpnProfileDetailActivity.java b/src/frontends/android/src/org/strongswan/android/ui/VpnProfileDetailActivity.java
index baad9611d4a5469241f7bf924f993c096f8170f9..6cc6b0c020b77a3877eb34acfd642e97633a8350 100644 (file)
--- a/src/frontends/android/src/org/strongswan/android/ui/VpnProfileDetailActivity.java
+++ b/src/frontends/android/src/org/strongswan/android/ui/VpnProfileDetailActivity.java
@@ -20,11 +20,11 @@ package org.strongswan.android.ui;
 import java.security.cert.X509Certificate;
 
 import org.strongswan.android.R;
-import org.strongswan.android.data.TrustedCertificateEntry;
 import org.strongswan.android.data.VpnProfile;
 import org.strongswan.android.data.VpnProfileDataSource;
 import org.strongswan.android.data.VpnType;
 import org.strongswan.android.logic.TrustedCertificateManager;
+import org.strongswan.android.security.TrustedCertificateEntry;
 
 import android.app.Activity;
 import android.app.AlertDialog;

diff --git a/src/frontends/android/src/org/strongswan/android/ui/adapter/TrustedCertificateAdapter.java b/src/frontends/android/src/org/strongswan/android/ui/adapter/TrustedCertificateAdapter.java
index a97360d58797ecda87d7b44dde1dc1a60af46d12..3795bb199ed210de36beca77953540331782e52b 100644 (file)
--- a/src/frontends/android/src/org/strongswan/android/ui/adapter/TrustedCertificateAdapter.java
+++ b/src/frontends/android/src/org/strongswan/android/ui/adapter/TrustedCertificateAdapter.java
@@ -18,7 +18,7 @@ package org.strongswan.android.ui.adapter;
 import java.util.List;
 
 import org.strongswan.android.R;
-import org.strongswan.android.data.TrustedCertificateEntry;
+import org.strongswan.android.security.TrustedCertificateEntry;
 
 import android.content.Context;
 import android.view.LayoutInflater;