From 3c2f20b2fc498a0b7c3e4a782edcd61c759ece1b Mon Sep 17 00:00:00 2001 From: vadym Date: Sat, 26 Jun 2021 18:37:20 +0300 Subject: [PATCH] 1. renamed app package --- app/build.gradle | 4 ++-- .../app/crispa}/ExampleInstrumentedTest.kt | 2 +- app/src/main/AndroidManifest.xml | 24 +++++++++---------- .../chronosx88/yggdrasil/models/Status.kt | 5 ---- .../yggdrasil/app/crispa}/AboutActivity.kt | 2 +- .../app/crispa}/CopyLocalNodeInfoActivity.kt | 7 +++--- .../yggdrasil/app/crispa}/DNSListActivity.kt | 12 +++++----- .../yggdrasil/app/crispa}/MainActivity.kt | 24 +++++++++---------- .../yggdrasil/app/crispa}/PeerListActivity.kt | 18 +++++++------- .../yggdrasil/app/crispa}/Utils.kt | 4 ++-- .../yggdrasil/app/crispa}/YggApplication.kt | 4 ++-- .../app/crispa}/YggdrasilTunService.kt | 16 ++++++------- .../yggdrasil/app/crispa}/models/DNSInfo.kt | 2 +- .../yggdrasil/app/crispa}/models/NodeInfo.kt | 2 +- .../yggdrasil/app/crispa}/models/PeerInfo.kt | 2 +- .../org/yggdrasil/app/crispa/models/Status.kt | 5 ++++ .../app/crispa}/models/config/Config.kt | 2 +- .../models/config/DNSInfoListAdapter.kt | 6 ++--- .../crispa}/models/config/DropDownAdapter.kt | 4 ++-- .../app/crispa}/models/config/NetworkUtils.kt | 2 +- .../models/config/NodeInfoListAdapter.kt | 6 ++--- .../app/crispa}/models/config/Peer.kt | 2 +- .../models/config/PeerInfoListAdapter.kt | 6 ++--- .../models/config/SelectDNSInfoAdapter.kt | 6 ++--- .../config/SelectPeerInfoListAdapter.kt | 6 ++--- .../crispa}/models/config/SessionFirewall.kt | 2 +- .../crispa}/models/config/SwitchOptions.kt | 2 +- .../crispa}/models/config/TunnelRouting.kt | 2 +- .../app/crispa}/models/config/Utils.kt | 6 ++--- .../yggdrasil/app/crispa}/ExampleUnitTest.kt | 2 +- 30 files changed, 93 insertions(+), 94 deletions(-) rename app/src/androidTest/java/{io/github/chronosx88/yggdrasil => org/yggdrasil/app/crispa}/ExampleInstrumentedTest.kt (93%) delete mode 100644 app/src/main/java/io/github/chronosx88/yggdrasil/models/Status.kt rename app/src/main/java/{io/github/chronosx88/yggdrasil => org/yggdrasil/app/crispa}/AboutActivity.kt (99%) rename app/src/main/java/{io/github/chronosx88/yggdrasil => org/yggdrasil/app/crispa}/CopyLocalNodeInfoActivity.kt (87%) rename app/src/main/java/{io/github/chronosx88/yggdrasil => org/yggdrasil/app/crispa}/DNSListActivity.kt (92%) rename app/src/main/java/{io/github/chronosx88/yggdrasil => org/yggdrasil/app/crispa}/MainActivity.kt (94%) rename app/src/main/java/{io/github/chronosx88/yggdrasil => org/yggdrasil/app/crispa}/PeerListActivity.kt (96%) rename app/src/main/java/{io/github/chronosx88/yggdrasil => org/yggdrasil/app/crispa}/Utils.kt (88%) rename app/src/main/java/{io/github/chronosx88/yggdrasil => org/yggdrasil/app/crispa}/YggApplication.kt (93%) rename app/src/main/java/{io/github/chronosx88/yggdrasil => org/yggdrasil/app/crispa}/YggdrasilTunService.kt (94%) rename app/src/main/java/{io/github/chronosx88/yggdrasil => org/yggdrasil/app/crispa}/models/DNSInfo.kt (94%) rename app/src/main/java/{io/github/chronosx88/yggdrasil => org/yggdrasil/app/crispa}/models/NodeInfo.kt (78%) rename app/src/main/java/{io/github/chronosx88/yggdrasil => org/yggdrasil/app/crispa}/models/PeerInfo.kt (97%) create mode 100644 app/src/main/java/org/yggdrasil/app/crispa/models/Status.kt rename app/src/main/java/{io/github/chronosx88/yggdrasil => org/yggdrasil/app/crispa}/models/config/Config.kt (95%) rename app/src/main/java/{io/github/chronosx88/yggdrasil => org/yggdrasil/app/crispa}/models/config/DNSInfoListAdapter.kt (90%) rename app/src/main/java/{io/github/chronosx88/yggdrasil => org/yggdrasil/app/crispa}/models/config/DropDownAdapter.kt (95%) rename app/src/main/java/{io/github/chronosx88/yggdrasil => org/yggdrasil/app/crispa}/models/config/NetworkUtils.kt (96%) rename app/src/main/java/{io/github/chronosx88/yggdrasil => org/yggdrasil/app/crispa}/models/config/NodeInfoListAdapter.kt (93%) rename app/src/main/java/{io/github/chronosx88/yggdrasil => org/yggdrasil/app/crispa}/models/config/Peer.kt (94%) rename app/src/main/java/{io/github/chronosx88/yggdrasil => org/yggdrasil/app/crispa}/models/config/PeerInfoListAdapter.kt (91%) rename app/src/main/java/{io/github/chronosx88/yggdrasil => org/yggdrasil/app/crispa}/models/config/SelectDNSInfoAdapter.kt (96%) rename app/src/main/java/{io/github/chronosx88/yggdrasil => org/yggdrasil/app/crispa}/models/config/SelectPeerInfoListAdapter.kt (96%) rename app/src/main/java/{io/github/chronosx88/yggdrasil => org/yggdrasil/app/crispa}/models/config/SessionFirewall.kt (95%) rename app/src/main/java/{io/github/chronosx88/yggdrasil => org/yggdrasil/app/crispa}/models/config/SwitchOptions.kt (79%) rename app/src/main/java/{io/github/chronosx88/yggdrasil => org/yggdrasil/app/crispa}/models/config/TunnelRouting.kt (95%) rename app/src/main/java/{io/github/chronosx88/yggdrasil => org/yggdrasil/app/crispa}/models/config/Utils.kt (96%) rename app/src/test/java/{io/github/chronosx88/yggdrasil => org/yggdrasil/app/crispa}/ExampleUnitTest.kt (89%) diff --git a/app/build.gradle b/app/build.gradle index d2fee53..bf4ac88 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { minSdkVersion 15 targetSdkVersion 29 - versionCode 32 - versionName "2.0.14" + versionCode 34 + versionName "2.0.16" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" setProperty("archivesBaseName", project.getParent().name+"-"+versionName) } diff --git a/app/src/androidTest/java/io/github/chronosx88/yggdrasil/ExampleInstrumentedTest.kt b/app/src/androidTest/java/org/yggdrasil/app/crispa/ExampleInstrumentedTest.kt similarity index 93% rename from app/src/androidTest/java/io/github/chronosx88/yggdrasil/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/org/yggdrasil/app/crispa/ExampleInstrumentedTest.kt index 3f568e7..24cb359 100644 --- a/app/src/androidTest/java/io/github/chronosx88/yggdrasil/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/org/yggdrasil/app/crispa/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package io.github.chronosx88.yggdrasil +package org.yggdrasil.app.crispa import androidx.test.InstrumentationRegistry import androidx.test.runner.AndroidJUnit4 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5bdfd71..40c30f1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,14 +1,14 @@ + package="org.yggdrasil.app.crispa"> - diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/models/Status.kt b/app/src/main/java/io/github/chronosx88/yggdrasil/models/Status.kt deleted file mode 100644 index ecb73d8..0000000 --- a/app/src/main/java/io/github/chronosx88/yggdrasil/models/Status.kt +++ /dev/null @@ -1,5 +0,0 @@ -package io.github.chronosx88.yggdrasil.models - -class Status { - var up: Boolean = false -} \ No newline at end of file diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/AboutActivity.kt b/app/src/main/java/org/yggdrasil/app/crispa/AboutActivity.kt similarity index 99% rename from app/src/main/java/io/github/chronosx88/yggdrasil/AboutActivity.kt rename to app/src/main/java/org/yggdrasil/app/crispa/AboutActivity.kt index 9d63a91..1f480cd 100644 --- a/app/src/main/java/io/github/chronosx88/yggdrasil/AboutActivity.kt +++ b/app/src/main/java/org/yggdrasil/app/crispa/AboutActivity.kt @@ -1,4 +1,4 @@ -package io.github.chronosx88.yggdrasil +package org.yggdrasil.app.crispa import android.os.Bundle import android.text.Html diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/CopyLocalNodeInfoActivity.kt b/app/src/main/java/org/yggdrasil/app/crispa/CopyLocalNodeInfoActivity.kt similarity index 87% rename from app/src/main/java/io/github/chronosx88/yggdrasil/CopyLocalNodeInfoActivity.kt rename to app/src/main/java/org/yggdrasil/app/crispa/CopyLocalNodeInfoActivity.kt index 3a5bedf..8358659 100644 --- a/app/src/main/java/io/github/chronosx88/yggdrasil/CopyLocalNodeInfoActivity.kt +++ b/app/src/main/java/org/yggdrasil/app/crispa/CopyLocalNodeInfoActivity.kt @@ -1,13 +1,12 @@ -package io.github.chronosx88.yggdrasil +package org.yggdrasil.app.crispa import android.os.Bundle -import android.widget.ListView import androidx.appcompat.app.AppCompatActivity import androidx.preference.PreferenceManager import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import io.github.chronosx88.yggdrasil.models.NodeInfo -import io.github.chronosx88.yggdrasil.models.config.NodeInfoListAdapter +import org.yggdrasil.app.crispa.models.NodeInfo +import org.yggdrasil.app.crispa.models.config.NodeInfoListAdapter class CopyLocalNodeInfoActivity: AppCompatActivity() { diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/DNSListActivity.kt b/app/src/main/java/org/yggdrasil/app/crispa/DNSListActivity.kt similarity index 92% rename from app/src/main/java/io/github/chronosx88/yggdrasil/DNSListActivity.kt rename to app/src/main/java/org/yggdrasil/app/crispa/DNSListActivity.kt index 8a464b2..2c468c3 100644 --- a/app/src/main/java/io/github/chronosx88/yggdrasil/DNSListActivity.kt +++ b/app/src/main/java/org/yggdrasil/app/crispa/DNSListActivity.kt @@ -1,4 +1,4 @@ -package io.github.chronosx88.yggdrasil +package org.yggdrasil.app.crispa import android.app.Activity import android.content.Intent @@ -9,11 +9,11 @@ import android.widget.* import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity import com.google.android.material.floatingactionbutton.FloatingActionButton -import io.github.chronosx88.yggdrasil.models.DNSInfo -import io.github.chronosx88.yggdrasil.models.config.SelectDNSInfoListAdapter -import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializeStringList2DNSInfoSet -import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.ping -import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.serializeDNSInfoSet2StringList +import org.yggdrasil.app.crispa.models.DNSInfo +import org.yggdrasil.app.crispa.models.config.SelectDNSInfoListAdapter +import org.yggdrasil.app.crispa.models.config.Utils.Companion.deserializeStringList2DNSInfoSet +import org.yggdrasil.app.crispa.models.config.Utils.Companion.ping +import org.yggdrasil.app.crispa.models.config.Utils.Companion.serializeDNSInfoSet2StringList import kotlinx.coroutines.* import java.net.InetAddress import kotlin.concurrent.thread diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt b/app/src/main/java/org/yggdrasil/app/crispa/MainActivity.kt similarity index 94% rename from app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt rename to app/src/main/java/org/yggdrasil/app/crispa/MainActivity.kt index b4d56ab..7324dbc 100644 --- a/app/src/main/java/io/github/chronosx88/yggdrasil/MainActivity.kt +++ b/app/src/main/java/org/yggdrasil/app/crispa/MainActivity.kt @@ -1,4 +1,4 @@ -package io.github.chronosx88.yggdrasil +package org.yggdrasil.app.crispa import android.app.Activity import android.app.ActivityManager @@ -14,17 +14,17 @@ import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.widget.SwitchCompat import androidx.preference.PreferenceManager import dalvik.system.DexFile -import io.github.chronosx88.yggdrasil.models.DNSInfo -import io.github.chronosx88.yggdrasil.models.PeerInfo -import io.github.chronosx88.yggdrasil.models.config.DNSInfoListAdapter -import io.github.chronosx88.yggdrasil.models.config.PeerInfoListAdapter -import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializePeerStringList2PeerInfoSet -import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializeStringList2DNSInfoSet -import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializeStringList2PeerInfoSet -import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializeStringSet2DNSInfoSet -import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializeStringSet2PeerInfoSet -import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.serializeDNSInfoSet2StringList -import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.serializePeerInfoSet2StringList +import org.yggdrasil.app.crispa.models.DNSInfo +import org.yggdrasil.app.crispa.models.PeerInfo +import org.yggdrasil.app.crispa.models.config.DNSInfoListAdapter +import org.yggdrasil.app.crispa.models.config.PeerInfoListAdapter +import org.yggdrasil.app.crispa.models.config.Utils.Companion.deserializePeerStringList2PeerInfoSet +import org.yggdrasil.app.crispa.models.config.Utils.Companion.deserializeStringList2DNSInfoSet +import org.yggdrasil.app.crispa.models.config.Utils.Companion.deserializeStringList2PeerInfoSet +import org.yggdrasil.app.crispa.models.config.Utils.Companion.deserializeStringSet2DNSInfoSet +import org.yggdrasil.app.crispa.models.config.Utils.Companion.deserializeStringSet2PeerInfoSet +import org.yggdrasil.app.crispa.models.config.Utils.Companion.serializeDNSInfoSet2StringList +import org.yggdrasil.app.crispa.models.config.Utils.Companion.serializePeerInfoSet2StringList import kotlin.concurrent.thread diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/PeerListActivity.kt b/app/src/main/java/org/yggdrasil/app/crispa/PeerListActivity.kt similarity index 96% rename from app/src/main/java/io/github/chronosx88/yggdrasil/PeerListActivity.kt rename to app/src/main/java/org/yggdrasil/app/crispa/PeerListActivity.kt index fe3a928..b3bfe72 100644 --- a/app/src/main/java/io/github/chronosx88/yggdrasil/PeerListActivity.kt +++ b/app/src/main/java/org/yggdrasil/app/crispa/PeerListActivity.kt @@ -1,4 +1,4 @@ -package io.github.chronosx88.yggdrasil +package org.yggdrasil.app.crispa import android.app.Activity import android.content.Intent @@ -21,13 +21,13 @@ import com.hbb20.CCPCountry import com.vincentbrison.openlibraries.android.dualcache.Builder import com.vincentbrison.openlibraries.android.dualcache.SizeOf import com.vincentbrison.openlibraries.android.dualcache.JsonSerializer -import io.github.chronosx88.yggdrasil.models.PeerInfo -import io.github.chronosx88.yggdrasil.models.Status -import io.github.chronosx88.yggdrasil.models.config.DropDownAdapter -import io.github.chronosx88.yggdrasil.models.config.SelectPeerInfoListAdapter -import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializeStringList2PeerInfoSet -import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.ping -import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.serializePeerInfoSet2StringList +import org.yggdrasil.app.crispa.models.PeerInfo +import org.yggdrasil.app.crispa.models.Status +import org.yggdrasil.app.crispa.models.config.DropDownAdapter +import org.yggdrasil.app.crispa.models.config.SelectPeerInfoListAdapter +import org.yggdrasil.app.crispa.models.config.Utils.Companion.deserializeStringList2PeerInfoSet +import org.yggdrasil.app.crispa.models.config.Utils.Companion.ping +import org.yggdrasil.app.crispa.models.config.Utils.Companion.serializePeerInfoSet2StringList import kotlinx.coroutines.* import java.io.ByteArrayOutputStream import java.io.FileNotFoundException @@ -43,7 +43,7 @@ class PeerListActivity : AppCompatActivity() { companion object { const val PEER_LIST = "PEER_LIST" - const val PEER_LIST_URL = "xxx" + const val PEER_LIST_URL = "http://y4.rivchain.org/rest/peers.json" const val CACHE_NAME = "PEER_LIST_CACHE" const val ONLINE_PEERINFO_LIST = "online_peer_info_list" const val OFFLINE_PEERINFO_LIST = "offline_peer_info_list" diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/Utils.kt b/app/src/main/java/org/yggdrasil/app/crispa/Utils.kt similarity index 88% rename from app/src/main/java/io/github/chronosx88/yggdrasil/Utils.kt rename to app/src/main/java/org/yggdrasil/app/crispa/Utils.kt index 25b62ea..d118246 100644 --- a/app/src/main/java/io/github/chronosx88/yggdrasil/Utils.kt +++ b/app/src/main/java/org/yggdrasil/app/crispa/Utils.kt @@ -1,9 +1,9 @@ -package io.github.chronosx88.yggdrasil +package org.yggdrasil.app.crispa import android.content.Context import com.google.gson.Gson import config.NodeConfig -import io.github.chronosx88.yggdrasil.models.config.Config +import org.yggdrasil.app.crispa.models.config.Config import java.io.File val gson = Gson() diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/YggApplication.kt b/app/src/main/java/org/yggdrasil/app/crispa/YggApplication.kt similarity index 93% rename from app/src/main/java/io/github/chronosx88/yggdrasil/YggApplication.kt rename to app/src/main/java/org/yggdrasil/app/crispa/YggApplication.kt index 84906b7..d8f9fb4 100644 --- a/app/src/main/java/io/github/chronosx88/yggdrasil/YggApplication.kt +++ b/app/src/main/java/org/yggdrasil/app/crispa/YggApplication.kt @@ -1,4 +1,4 @@ -package io.github.chronosx88.yggdrasil +package org.yggdrasil.app.crispa import android.app.Application import android.content.Context @@ -11,7 +11,7 @@ import org.acra.sender.HttpSender class YggApplication : Application() { companion object { - const val ACRA_BACKEND_URL = "xxx" + const val ACRA_BACKEND_URL = "http://acrarium.rivchain.org/acrarium-1.4.6/report" } override fun attachBaseContext(base: Context) { diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt b/app/src/main/java/org/yggdrasil/app/crispa/YggdrasilTunService.kt similarity index 94% rename from app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt rename to app/src/main/java/org/yggdrasil/app/crispa/YggdrasilTunService.kt index 9c5f4d8..088095f 100644 --- a/app/src/main/java/io/github/chronosx88/yggdrasil/YggdrasilTunService.kt +++ b/app/src/main/java/org/yggdrasil/app/crispa/YggdrasilTunService.kt @@ -1,4 +1,4 @@ -package io.github.chronosx88.yggdrasil +package org.yggdrasil.app.crispa import android.app.* import android.content.Context @@ -14,13 +14,13 @@ import androidx.core.app.NotificationCompat import androidx.preference.PreferenceManager import com.google.gson.Gson import com.google.gson.reflect.TypeToken -import io.github.chronosx88.yggdrasil.models.DNSInfo -import io.github.chronosx88.yggdrasil.models.PeerInfo -import io.github.chronosx88.yggdrasil.models.config.Peer -import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.convertPeer2PeerStringList -import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.convertPeerInfoSet2PeerIdSet -import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializeStringList2DNSInfoSet -import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializeStringList2PeerInfoSet +import org.yggdrasil.app.crispa.models.DNSInfo +import org.yggdrasil.app.crispa.models.PeerInfo +import org.yggdrasil.app.crispa.models.config.Peer +import org.yggdrasil.app.crispa.models.config.Utils.Companion.convertPeer2PeerStringList +import org.yggdrasil.app.crispa.models.config.Utils.Companion.convertPeerInfoSet2PeerIdSet +import org.yggdrasil.app.crispa.models.config.Utils.Companion.deserializeStringList2DNSInfoSet +import org.yggdrasil.app.crispa.models.config.Utils.Companion.deserializeStringList2PeerInfoSet import mobile.Mobile import mobile.Yggdrasil import org.acra.ACRA diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/models/DNSInfo.kt b/app/src/main/java/org/yggdrasil/app/crispa/models/DNSInfo.kt similarity index 94% rename from app/src/main/java/io/github/chronosx88/yggdrasil/models/DNSInfo.kt rename to app/src/main/java/org/yggdrasil/app/crispa/models/DNSInfo.kt index 52f4c73..c03cd18 100644 --- a/app/src/main/java/io/github/chronosx88/yggdrasil/models/DNSInfo.kt +++ b/app/src/main/java/org/yggdrasil/app/crispa/models/DNSInfo.kt @@ -1,4 +1,4 @@ -package io.github.chronosx88.yggdrasil.models +package org.yggdrasil.app.crispa.models import android.content.Context import com.hbb20.CCPCountry diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/models/NodeInfo.kt b/app/src/main/java/org/yggdrasil/app/crispa/models/NodeInfo.kt similarity index 78% rename from app/src/main/java/io/github/chronosx88/yggdrasil/models/NodeInfo.kt rename to app/src/main/java/org/yggdrasil/app/crispa/models/NodeInfo.kt index b81462c..c9ea0ee 100644 --- a/app/src/main/java/io/github/chronosx88/yggdrasil/models/NodeInfo.kt +++ b/app/src/main/java/org/yggdrasil/app/crispa/models/NodeInfo.kt @@ -1,4 +1,4 @@ -package io.github.chronosx88.yggdrasil.models +package org.yggdrasil.app.crispa.models class NodeInfo { diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/models/PeerInfo.kt b/app/src/main/java/org/yggdrasil/app/crispa/models/PeerInfo.kt similarity index 97% rename from app/src/main/java/io/github/chronosx88/yggdrasil/models/PeerInfo.kt rename to app/src/main/java/org/yggdrasil/app/crispa/models/PeerInfo.kt index c17a327..b6e2069 100644 --- a/app/src/main/java/io/github/chronosx88/yggdrasil/models/PeerInfo.kt +++ b/app/src/main/java/org/yggdrasil/app/crispa/models/PeerInfo.kt @@ -1,4 +1,4 @@ -package io.github.chronosx88.yggdrasil.models +package org.yggdrasil.app.crispa.models import android.content.Context import com.hbb20.CCPCountry diff --git a/app/src/main/java/org/yggdrasil/app/crispa/models/Status.kt b/app/src/main/java/org/yggdrasil/app/crispa/models/Status.kt new file mode 100644 index 0000000..42f6056 --- /dev/null +++ b/app/src/main/java/org/yggdrasil/app/crispa/models/Status.kt @@ -0,0 +1,5 @@ +package org.yggdrasil.app.crispa.models + +class Status { + var up: Boolean = false +} \ No newline at end of file diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/Config.kt b/app/src/main/java/org/yggdrasil/app/crispa/models/config/Config.kt similarity index 95% rename from app/src/main/java/io/github/chronosx88/yggdrasil/models/config/Config.kt rename to app/src/main/java/org/yggdrasil/app/crispa/models/config/Config.kt index 6107b99..b63fa23 100644 --- a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/Config.kt +++ b/app/src/main/java/org/yggdrasil/app/crispa/models/config/Config.kt @@ -1,4 +1,4 @@ -package io.github.chronosx88.yggdrasil.models.config +package org.yggdrasil.app.crispa.models.config import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/DNSInfoListAdapter.kt b/app/src/main/java/org/yggdrasil/app/crispa/models/config/DNSInfoListAdapter.kt similarity index 90% rename from app/src/main/java/io/github/chronosx88/yggdrasil/models/config/DNSInfoListAdapter.kt rename to app/src/main/java/org/yggdrasil/app/crispa/models/config/DNSInfoListAdapter.kt index 8779dee..f33a1d2 100644 --- a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/DNSInfoListAdapter.kt +++ b/app/src/main/java/org/yggdrasil/app/crispa/models/config/DNSInfoListAdapter.kt @@ -1,4 +1,4 @@ -package io.github.chronosx88.yggdrasil.models.config +package org.yggdrasil.app.crispa.models.config import android.content.Context import android.view.LayoutInflater @@ -7,8 +7,8 @@ import android.view.ViewGroup import android.widget.ArrayAdapter import android.widget.ImageView import android.widget.TextView -import io.github.chronosx88.yggdrasil.R -import io.github.chronosx88.yggdrasil.models.DNSInfo +import org.yggdrasil.app.crispa.R +import org.yggdrasil.app.crispa.models.DNSInfo class DNSInfoListAdapter( diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/DropDownAdapter.kt b/app/src/main/java/org/yggdrasil/app/crispa/models/config/DropDownAdapter.kt similarity index 95% rename from app/src/main/java/io/github/chronosx88/yggdrasil/models/config/DropDownAdapter.kt rename to app/src/main/java/org/yggdrasil/app/crispa/models/config/DropDownAdapter.kt index f98fa33..e67110b 100644 --- a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/DropDownAdapter.kt +++ b/app/src/main/java/org/yggdrasil/app/crispa/models/config/DropDownAdapter.kt @@ -1,4 +1,4 @@ -package io.github.chronosx88.yggdrasil.models.config +package org.yggdrasil.app.crispa.models.config import android.content.Context import android.view.LayoutInflater @@ -11,7 +11,7 @@ import android.widget.AdapterView.OnItemClickListener import android.widget.ArrayAdapter import android.widget.PopupWindow import android.widget.TextView -import io.github.chronosx88.yggdrasil.R +import org.yggdrasil.app.crispa.R class DropDownAdapter( diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/NetworkUtils.kt b/app/src/main/java/org/yggdrasil/app/crispa/models/config/NetworkUtils.kt similarity index 96% rename from app/src/main/java/io/github/chronosx88/yggdrasil/models/config/NetworkUtils.kt rename to app/src/main/java/org/yggdrasil/app/crispa/models/config/NetworkUtils.kt index 5239389..f84d3ae 100644 --- a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/NetworkUtils.kt +++ b/app/src/main/java/org/yggdrasil/app/crispa/models/config/NetworkUtils.kt @@ -1,4 +1,4 @@ -package io.github.chronosx88.yggdrasil.models.config +package org.yggdrasil.app.crispa.models.config import android.content.Context import android.net.ConnectivityManager diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/NodeInfoListAdapter.kt b/app/src/main/java/org/yggdrasil/app/crispa/models/config/NodeInfoListAdapter.kt similarity index 93% rename from app/src/main/java/io/github/chronosx88/yggdrasil/models/config/NodeInfoListAdapter.kt rename to app/src/main/java/org/yggdrasil/app/crispa/models/config/NodeInfoListAdapter.kt index c90803e..edf17cf 100644 --- a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/NodeInfoListAdapter.kt +++ b/app/src/main/java/org/yggdrasil/app/crispa/models/config/NodeInfoListAdapter.kt @@ -1,4 +1,4 @@ -package io.github.chronosx88.yggdrasil.models.config +package org.yggdrasil.app.crispa.models.config import android.content.ClipData import android.content.ClipboardManager @@ -9,8 +9,8 @@ import android.view.ViewGroup import android.widget.TextView import android.widget.Toast import androidx.recyclerview.widget.RecyclerView -import io.github.chronosx88.yggdrasil.R -import io.github.chronosx88.yggdrasil.models.NodeInfo +import org.yggdrasil.app.crispa.R +import org.yggdrasil.app.crispa.models.NodeInfo class NodeInfoListAdapter(private val context: Context, private val infoSet: Array) : RecyclerView.Adapter() { diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/Peer.kt b/app/src/main/java/org/yggdrasil/app/crispa/models/config/Peer.kt similarity index 94% rename from app/src/main/java/io/github/chronosx88/yggdrasil/models/config/Peer.kt rename to app/src/main/java/org/yggdrasil/app/crispa/models/config/Peer.kt index ad1712b..0f8d240 100644 --- a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/Peer.kt +++ b/app/src/main/java/org/yggdrasil/app/crispa/models/config/Peer.kt @@ -1,4 +1,4 @@ -package io.github.chronosx88.yggdrasil.models.config +package org.yggdrasil.app.crispa.models.config import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/PeerInfoListAdapter.kt b/app/src/main/java/org/yggdrasil/app/crispa/models/config/PeerInfoListAdapter.kt similarity index 91% rename from app/src/main/java/io/github/chronosx88/yggdrasil/models/config/PeerInfoListAdapter.kt rename to app/src/main/java/org/yggdrasil/app/crispa/models/config/PeerInfoListAdapter.kt index f777eeb..9ae88af 100644 --- a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/PeerInfoListAdapter.kt +++ b/app/src/main/java/org/yggdrasil/app/crispa/models/config/PeerInfoListAdapter.kt @@ -1,4 +1,4 @@ -package io.github.chronosx88.yggdrasil.models.config +package org.yggdrasil.app.crispa.models.config import android.content.Context import android.view.LayoutInflater @@ -7,8 +7,8 @@ import android.view.ViewGroup import android.widget.ArrayAdapter import android.widget.ImageView import android.widget.TextView -import io.github.chronosx88.yggdrasil.R -import io.github.chronosx88.yggdrasil.models.PeerInfo +import org.yggdrasil.app.crispa.R +import org.yggdrasil.app.crispa.models.PeerInfo class PeerInfoListAdapter( diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/SelectDNSInfoAdapter.kt b/app/src/main/java/org/yggdrasil/app/crispa/models/config/SelectDNSInfoAdapter.kt similarity index 96% rename from app/src/main/java/io/github/chronosx88/yggdrasil/models/config/SelectDNSInfoAdapter.kt rename to app/src/main/java/org/yggdrasil/app/crispa/models/config/SelectDNSInfoAdapter.kt index 0b3cf93..78503da 100644 --- a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/SelectDNSInfoAdapter.kt +++ b/app/src/main/java/org/yggdrasil/app/crispa/models/config/SelectDNSInfoAdapter.kt @@ -1,4 +1,4 @@ -package io.github.chronosx88.yggdrasil.models.config +package org.yggdrasil.app.crispa.models.config import android.content.ClipData import android.content.ClipboardManager @@ -9,8 +9,8 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.* -import io.github.chronosx88.yggdrasil.R -import io.github.chronosx88.yggdrasil.models.DNSInfo +import org.yggdrasil.app.crispa.R +import org.yggdrasil.app.crispa.models.DNSInfo class SelectDNSInfoListAdapter( context: Context, diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/SelectPeerInfoListAdapter.kt b/app/src/main/java/org/yggdrasil/app/crispa/models/config/SelectPeerInfoListAdapter.kt similarity index 96% rename from app/src/main/java/io/github/chronosx88/yggdrasil/models/config/SelectPeerInfoListAdapter.kt rename to app/src/main/java/org/yggdrasil/app/crispa/models/config/SelectPeerInfoListAdapter.kt index 147112c..57ec567 100644 --- a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/SelectPeerInfoListAdapter.kt +++ b/app/src/main/java/org/yggdrasil/app/crispa/models/config/SelectPeerInfoListAdapter.kt @@ -1,4 +1,4 @@ -package io.github.chronosx88.yggdrasil.models.config +package org.yggdrasil.app.crispa.models.config import android.content.ClipData import android.content.ClipboardManager @@ -9,8 +9,8 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.* -import io.github.chronosx88.yggdrasil.R -import io.github.chronosx88.yggdrasil.models.PeerInfo +import org.yggdrasil.app.crispa.R +import org.yggdrasil.app.crispa.models.PeerInfo class SelectPeerInfoListAdapter( context: Context, diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/SessionFirewall.kt b/app/src/main/java/org/yggdrasil/app/crispa/models/config/SessionFirewall.kt similarity index 95% rename from app/src/main/java/io/github/chronosx88/yggdrasil/models/config/SessionFirewall.kt rename to app/src/main/java/org/yggdrasil/app/crispa/models/config/SessionFirewall.kt index fc225e1..50bf9fe 100644 --- a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/SessionFirewall.kt +++ b/app/src/main/java/org/yggdrasil/app/crispa/models/config/SessionFirewall.kt @@ -1,4 +1,4 @@ -package io.github.chronosx88.yggdrasil.models.config +package org.yggdrasil.app.crispa.models.config import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/SwitchOptions.kt b/app/src/main/java/org/yggdrasil/app/crispa/models/config/SwitchOptions.kt similarity index 79% rename from app/src/main/java/io/github/chronosx88/yggdrasil/models/config/SwitchOptions.kt rename to app/src/main/java/org/yggdrasil/app/crispa/models/config/SwitchOptions.kt index 3893b7c..1ea2c5d 100644 --- a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/SwitchOptions.kt +++ b/app/src/main/java/org/yggdrasil/app/crispa/models/config/SwitchOptions.kt @@ -1,4 +1,4 @@ -package io.github.chronosx88.yggdrasil.models.config +package org.yggdrasil.app.crispa.models.config import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/TunnelRouting.kt b/app/src/main/java/org/yggdrasil/app/crispa/models/config/TunnelRouting.kt similarity index 95% rename from app/src/main/java/io/github/chronosx88/yggdrasil/models/config/TunnelRouting.kt rename to app/src/main/java/org/yggdrasil/app/crispa/models/config/TunnelRouting.kt index 2386bd4..3addb05 100644 --- a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/TunnelRouting.kt +++ b/app/src/main/java/org/yggdrasil/app/crispa/models/config/TunnelRouting.kt @@ -1,4 +1,4 @@ -package io.github.chronosx88.yggdrasil.models.config +package org.yggdrasil.app.crispa.models.config import com.google.gson.annotations.SerializedName diff --git a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/Utils.kt b/app/src/main/java/org/yggdrasil/app/crispa/models/config/Utils.kt similarity index 96% rename from app/src/main/java/io/github/chronosx88/yggdrasil/models/config/Utils.kt rename to app/src/main/java/org/yggdrasil/app/crispa/models/config/Utils.kt index 99ed43d..305d1e4 100644 --- a/app/src/main/java/io/github/chronosx88/yggdrasil/models/config/Utils.kt +++ b/app/src/main/java/org/yggdrasil/app/crispa/models/config/Utils.kt @@ -1,8 +1,8 @@ -package io.github.chronosx88.yggdrasil.models.config +package org.yggdrasil.app.crispa.models.config import com.google.gson.Gson -import io.github.chronosx88.yggdrasil.models.DNSInfo -import io.github.chronosx88.yggdrasil.models.PeerInfo +import org.yggdrasil.app.crispa.models.DNSInfo +import org.yggdrasil.app.crispa.models.PeerInfo import org.acra.ACRA import java.net.InetAddress import java.net.InetSocketAddress diff --git a/app/src/test/java/io/github/chronosx88/yggdrasil/ExampleUnitTest.kt b/app/src/test/java/org/yggdrasil/app/crispa/ExampleUnitTest.kt similarity index 89% rename from app/src/test/java/io/github/chronosx88/yggdrasil/ExampleUnitTest.kt rename to app/src/test/java/org/yggdrasil/app/crispa/ExampleUnitTest.kt index 462224f..2034cfb 100644 --- a/app/src/test/java/io/github/chronosx88/yggdrasil/ExampleUnitTest.kt +++ b/app/src/test/java/org/yggdrasil/app/crispa/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package io.github.chronosx88.yggdrasil +package org.yggdrasil.app.crispa import org.junit.Test