1. renamed app package

This commit is contained in:
vadym 2021-06-26 18:37:20 +03:00
parent 259aa4cbc8
commit 3c2f20b2fc
30 changed files with 93 additions and 94 deletions

View File

@ -8,8 +8,8 @@ android {
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 29 targetSdkVersion 29
versionCode 32 versionCode 34
versionName "2.0.14" versionName "2.0.16"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
setProperty("archivesBaseName", project.getParent().name+"-"+versionName) setProperty("archivesBaseName", project.getParent().name+"-"+versionName)
} }

View File

@ -1,4 +1,4 @@
package io.github.chronosx88.yggdrasil package org.yggdrasil.app.crispa
import androidx.test.InstrumentationRegistry import androidx.test.InstrumentationRegistry
import androidx.test.runner.AndroidJUnit4 import androidx.test.runner.AndroidJUnit4

View File

@ -1,14 +1,14 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="io.github.chronosx88.yggdrasil"> package="org.yggdrasil.app.crispa">
<uses-permission android:name="android.permission.FOREGROUND_SERVICE"/> <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
<application <application
android:name=".YggApplication" android:name="org.yggdrasil.app.crispa.YggApplication"
android:allowBackup="true" android:allowBackup="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
@ -17,31 +17,31 @@
android:usesCleartextTraffic="true" android:usesCleartextTraffic="true"
tools:ignore="GoogleAppIndexingWarning"> tools:ignore="GoogleAppIndexingWarning">
<activity <activity
android:name=".AboutActivity" android:name="org.yggdrasil.app.crispa.AboutActivity"
android:parentActivityName=".MainActivity" android:parentActivityName="org.yggdrasil.app.crispa.MainActivity"
android:label="@string/title_activity_about" android:label="@string/title_activity_about"
android:theme="@style/AppTheme.NoActionBar" android:theme="@style/AppTheme.NoActionBar"
android:screenOrientation="portrait"/> android:screenOrientation="portrait"/>
<activity <activity
android:name=".PeerListActivity" android:name="org.yggdrasil.app.crispa.PeerListActivity"
android:parentActivityName=".MainActivity" android:parentActivityName="org.yggdrasil.app.crispa.MainActivity"
android:label="@string/title_activity_peer_list" android:label="@string/title_activity_peer_list"
android:theme="@style/AppTheme.NoActionBar" android:theme="@style/AppTheme.NoActionBar"
android:screenOrientation="portrait"/> android:screenOrientation="portrait"/>
<activity <activity
android:name=".DNSListActivity" android:name="org.yggdrasil.app.crispa.DNSListActivity"
android:parentActivityName=".MainActivity" android:parentActivityName="org.yggdrasil.app.crispa.MainActivity"
android:label="@string/title_activity_dns_list" android:label="@string/title_activity_dns_list"
android:theme="@style/AppTheme.NoActionBar" android:theme="@style/AppTheme.NoActionBar"
android:screenOrientation="portrait"/> android:screenOrientation="portrait"/>
<activity <activity
android:name=".CopyLocalNodeInfoActivity" android:name="org.yggdrasil.app.crispa.CopyLocalNodeInfoActivity"
android:parentActivityName=".MainActivity" android:parentActivityName="org.yggdrasil.app.crispa.MainActivity"
android:label="@string/title_activity_copy_local_node_info" android:label="@string/title_activity_copy_local_node_info"
android:theme="@style/AppTheme.NoActionBar" android:theme="@style/AppTheme.NoActionBar"
android:screenOrientation="portrait"/> android:screenOrientation="portrait"/>
<service <service
android:name=".YggdrasilTunService" android:name="org.yggdrasil.app.crispa.YggdrasilTunService"
android:stopWithTask="true" android:stopWithTask="true"
android:enabled="true" android:enabled="true"
android:exported="true" android:exported="true"
@ -51,7 +51,7 @@
</intent-filter> </intent-filter>
</service> </service>
<activity android:name=".MainActivity" <activity android:name="org.yggdrasil.app.crispa.MainActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar" android:theme="@style/AppTheme.NoActionBar"
android:screenOrientation="portrait"> android:screenOrientation="portrait">

View File

@ -1,5 +0,0 @@
package io.github.chronosx88.yggdrasil.models
class Status {
var up: Boolean = false
}

View File

@ -1,4 +1,4 @@
package io.github.chronosx88.yggdrasil package org.yggdrasil.app.crispa
import android.os.Bundle import android.os.Bundle
import android.text.Html import android.text.Html

View File

@ -1,13 +1,12 @@
package io.github.chronosx88.yggdrasil package org.yggdrasil.app.crispa
import android.os.Bundle import android.os.Bundle
import android.widget.ListView
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import io.github.chronosx88.yggdrasil.models.NodeInfo import org.yggdrasil.app.crispa.models.NodeInfo
import io.github.chronosx88.yggdrasil.models.config.NodeInfoListAdapter import org.yggdrasil.app.crispa.models.config.NodeInfoListAdapter
class CopyLocalNodeInfoActivity: AppCompatActivity() { class CopyLocalNodeInfoActivity: AppCompatActivity() {

View File

@ -1,4 +1,4 @@
package io.github.chronosx88.yggdrasil package org.yggdrasil.app.crispa
import android.app.Activity import android.app.Activity
import android.content.Intent import android.content.Intent
@ -9,11 +9,11 @@ import android.widget.*
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import com.google.android.material.floatingactionbutton.FloatingActionButton import com.google.android.material.floatingactionbutton.FloatingActionButton
import io.github.chronosx88.yggdrasil.models.DNSInfo import org.yggdrasil.app.crispa.models.DNSInfo
import io.github.chronosx88.yggdrasil.models.config.SelectDNSInfoListAdapter import org.yggdrasil.app.crispa.models.config.SelectDNSInfoListAdapter
import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializeStringList2DNSInfoSet import org.yggdrasil.app.crispa.models.config.Utils.Companion.deserializeStringList2DNSInfoSet
import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.ping import org.yggdrasil.app.crispa.models.config.Utils.Companion.ping
import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.serializeDNSInfoSet2StringList import org.yggdrasil.app.crispa.models.config.Utils.Companion.serializeDNSInfoSet2StringList
import kotlinx.coroutines.* import kotlinx.coroutines.*
import java.net.InetAddress import java.net.InetAddress
import kotlin.concurrent.thread import kotlin.concurrent.thread

View File

@ -1,4 +1,4 @@
package io.github.chronosx88.yggdrasil package org.yggdrasil.app.crispa
import android.app.Activity import android.app.Activity
import android.app.ActivityManager import android.app.ActivityManager
@ -14,17 +14,17 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.SwitchCompat import androidx.appcompat.widget.SwitchCompat
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import dalvik.system.DexFile import dalvik.system.DexFile
import io.github.chronosx88.yggdrasil.models.DNSInfo import org.yggdrasil.app.crispa.models.DNSInfo
import io.github.chronosx88.yggdrasil.models.PeerInfo import org.yggdrasil.app.crispa.models.PeerInfo
import io.github.chronosx88.yggdrasil.models.config.DNSInfoListAdapter import org.yggdrasil.app.crispa.models.config.DNSInfoListAdapter
import io.github.chronosx88.yggdrasil.models.config.PeerInfoListAdapter import org.yggdrasil.app.crispa.models.config.PeerInfoListAdapter
import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializePeerStringList2PeerInfoSet import org.yggdrasil.app.crispa.models.config.Utils.Companion.deserializePeerStringList2PeerInfoSet
import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializeStringList2DNSInfoSet import org.yggdrasil.app.crispa.models.config.Utils.Companion.deserializeStringList2DNSInfoSet
import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializeStringList2PeerInfoSet import org.yggdrasil.app.crispa.models.config.Utils.Companion.deserializeStringList2PeerInfoSet
import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializeStringSet2DNSInfoSet import org.yggdrasil.app.crispa.models.config.Utils.Companion.deserializeStringSet2DNSInfoSet
import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializeStringSet2PeerInfoSet import org.yggdrasil.app.crispa.models.config.Utils.Companion.deserializeStringSet2PeerInfoSet
import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.serializeDNSInfoSet2StringList import org.yggdrasil.app.crispa.models.config.Utils.Companion.serializeDNSInfoSet2StringList
import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.serializePeerInfoSet2StringList import org.yggdrasil.app.crispa.models.config.Utils.Companion.serializePeerInfoSet2StringList
import kotlin.concurrent.thread import kotlin.concurrent.thread

View File

@ -1,4 +1,4 @@
package io.github.chronosx88.yggdrasil package org.yggdrasil.app.crispa
import android.app.Activity import android.app.Activity
import android.content.Intent 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.Builder
import com.vincentbrison.openlibraries.android.dualcache.SizeOf import com.vincentbrison.openlibraries.android.dualcache.SizeOf
import com.vincentbrison.openlibraries.android.dualcache.JsonSerializer import com.vincentbrison.openlibraries.android.dualcache.JsonSerializer
import io.github.chronosx88.yggdrasil.models.PeerInfo import org.yggdrasil.app.crispa.models.PeerInfo
import io.github.chronosx88.yggdrasil.models.Status import org.yggdrasil.app.crispa.models.Status
import io.github.chronosx88.yggdrasil.models.config.DropDownAdapter import org.yggdrasil.app.crispa.models.config.DropDownAdapter
import io.github.chronosx88.yggdrasil.models.config.SelectPeerInfoListAdapter import org.yggdrasil.app.crispa.models.config.SelectPeerInfoListAdapter
import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializeStringList2PeerInfoSet import org.yggdrasil.app.crispa.models.config.Utils.Companion.deserializeStringList2PeerInfoSet
import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.ping import org.yggdrasil.app.crispa.models.config.Utils.Companion.ping
import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.serializePeerInfoSet2StringList import org.yggdrasil.app.crispa.models.config.Utils.Companion.serializePeerInfoSet2StringList
import kotlinx.coroutines.* import kotlinx.coroutines.*
import java.io.ByteArrayOutputStream import java.io.ByteArrayOutputStream
import java.io.FileNotFoundException import java.io.FileNotFoundException
@ -43,7 +43,7 @@ class PeerListActivity : AppCompatActivity() {
companion object { companion object {
const val PEER_LIST = "PEER_LIST" 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 CACHE_NAME = "PEER_LIST_CACHE"
const val ONLINE_PEERINFO_LIST = "online_peer_info_list" const val ONLINE_PEERINFO_LIST = "online_peer_info_list"
const val OFFLINE_PEERINFO_LIST = "offline_peer_info_list" const val OFFLINE_PEERINFO_LIST = "offline_peer_info_list"

View File

@ -1,9 +1,9 @@
package io.github.chronosx88.yggdrasil package org.yggdrasil.app.crispa
import android.content.Context import android.content.Context
import com.google.gson.Gson import com.google.gson.Gson
import config.NodeConfig import config.NodeConfig
import io.github.chronosx88.yggdrasil.models.config.Config import org.yggdrasil.app.crispa.models.config.Config
import java.io.File import java.io.File
val gson = Gson() val gson = Gson()

View File

@ -1,4 +1,4 @@
package io.github.chronosx88.yggdrasil package org.yggdrasil.app.crispa
import android.app.Application import android.app.Application
import android.content.Context import android.content.Context
@ -11,7 +11,7 @@ import org.acra.sender.HttpSender
class YggApplication : Application() { class YggApplication : Application() {
companion object { 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) { override fun attachBaseContext(base: Context) {

View File

@ -1,4 +1,4 @@
package io.github.chronosx88.yggdrasil package org.yggdrasil.app.crispa
import android.app.* import android.app.*
import android.content.Context import android.content.Context
@ -14,13 +14,13 @@ import androidx.core.app.NotificationCompat
import androidx.preference.PreferenceManager import androidx.preference.PreferenceManager
import com.google.gson.Gson import com.google.gson.Gson
import com.google.gson.reflect.TypeToken import com.google.gson.reflect.TypeToken
import io.github.chronosx88.yggdrasil.models.DNSInfo import org.yggdrasil.app.crispa.models.DNSInfo
import io.github.chronosx88.yggdrasil.models.PeerInfo import org.yggdrasil.app.crispa.models.PeerInfo
import io.github.chronosx88.yggdrasil.models.config.Peer import org.yggdrasil.app.crispa.models.config.Peer
import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.convertPeer2PeerStringList import org.yggdrasil.app.crispa.models.config.Utils.Companion.convertPeer2PeerStringList
import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.convertPeerInfoSet2PeerIdSet import org.yggdrasil.app.crispa.models.config.Utils.Companion.convertPeerInfoSet2PeerIdSet
import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializeStringList2DNSInfoSet import org.yggdrasil.app.crispa.models.config.Utils.Companion.deserializeStringList2DNSInfoSet
import io.github.chronosx88.yggdrasil.models.config.Utils.Companion.deserializeStringList2PeerInfoSet import org.yggdrasil.app.crispa.models.config.Utils.Companion.deserializeStringList2PeerInfoSet
import mobile.Mobile import mobile.Mobile
import mobile.Yggdrasil import mobile.Yggdrasil
import org.acra.ACRA import org.acra.ACRA

View File

@ -1,4 +1,4 @@
package io.github.chronosx88.yggdrasil.models package org.yggdrasil.app.crispa.models
import android.content.Context import android.content.Context
import com.hbb20.CCPCountry import com.hbb20.CCPCountry

View File

@ -1,4 +1,4 @@
package io.github.chronosx88.yggdrasil.models package org.yggdrasil.app.crispa.models
class NodeInfo { class NodeInfo {

View File

@ -1,4 +1,4 @@
package io.github.chronosx88.yggdrasil.models package org.yggdrasil.app.crispa.models
import android.content.Context import android.content.Context
import com.hbb20.CCPCountry import com.hbb20.CCPCountry

View File

@ -0,0 +1,5 @@
package org.yggdrasil.app.crispa.models
class Status {
var up: Boolean = false
}

View File

@ -1,4 +1,4 @@
package io.github.chronosx88.yggdrasil.models.config package org.yggdrasil.app.crispa.models.config
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName

View File

@ -1,4 +1,4 @@
package io.github.chronosx88.yggdrasil.models.config package org.yggdrasil.app.crispa.models.config
import android.content.Context import android.content.Context
import android.view.LayoutInflater import android.view.LayoutInflater
@ -7,8 +7,8 @@ import android.view.ViewGroup
import android.widget.ArrayAdapter import android.widget.ArrayAdapter
import android.widget.ImageView import android.widget.ImageView
import android.widget.TextView import android.widget.TextView
import io.github.chronosx88.yggdrasil.R import org.yggdrasil.app.crispa.R
import io.github.chronosx88.yggdrasil.models.DNSInfo import org.yggdrasil.app.crispa.models.DNSInfo
class DNSInfoListAdapter( class DNSInfoListAdapter(

View File

@ -1,4 +1,4 @@
package io.github.chronosx88.yggdrasil.models.config package org.yggdrasil.app.crispa.models.config
import android.content.Context import android.content.Context
import android.view.LayoutInflater import android.view.LayoutInflater
@ -11,7 +11,7 @@ import android.widget.AdapterView.OnItemClickListener
import android.widget.ArrayAdapter import android.widget.ArrayAdapter
import android.widget.PopupWindow import android.widget.PopupWindow
import android.widget.TextView import android.widget.TextView
import io.github.chronosx88.yggdrasil.R import org.yggdrasil.app.crispa.R
class DropDownAdapter( class DropDownAdapter(

View File

@ -1,4 +1,4 @@
package io.github.chronosx88.yggdrasil.models.config package org.yggdrasil.app.crispa.models.config
import android.content.Context import android.content.Context
import android.net.ConnectivityManager import android.net.ConnectivityManager

View File

@ -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.ClipData
import android.content.ClipboardManager import android.content.ClipboardManager
@ -9,8 +9,8 @@ import android.view.ViewGroup
import android.widget.TextView import android.widget.TextView
import android.widget.Toast import android.widget.Toast
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import io.github.chronosx88.yggdrasil.R import org.yggdrasil.app.crispa.R
import io.github.chronosx88.yggdrasil.models.NodeInfo import org.yggdrasil.app.crispa.models.NodeInfo
class NodeInfoListAdapter(private val context: Context, private val infoSet: Array<NodeInfo>) : class NodeInfoListAdapter(private val context: Context, private val infoSet: Array<NodeInfo>) :
RecyclerView.Adapter<NodeInfoListAdapter.ViewHolder>() { RecyclerView.Adapter<NodeInfoListAdapter.ViewHolder>() {

View File

@ -1,4 +1,4 @@
package io.github.chronosx88.yggdrasil.models.config package org.yggdrasil.app.crispa.models.config
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName

View File

@ -1,4 +1,4 @@
package io.github.chronosx88.yggdrasil.models.config package org.yggdrasil.app.crispa.models.config
import android.content.Context import android.content.Context
import android.view.LayoutInflater import android.view.LayoutInflater
@ -7,8 +7,8 @@ import android.view.ViewGroup
import android.widget.ArrayAdapter import android.widget.ArrayAdapter
import android.widget.ImageView import android.widget.ImageView
import android.widget.TextView import android.widget.TextView
import io.github.chronosx88.yggdrasil.R import org.yggdrasil.app.crispa.R
import io.github.chronosx88.yggdrasil.models.PeerInfo import org.yggdrasil.app.crispa.models.PeerInfo
class PeerInfoListAdapter( class PeerInfoListAdapter(

View File

@ -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.ClipData
import android.content.ClipboardManager import android.content.ClipboardManager
@ -9,8 +9,8 @@ import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.* import android.widget.*
import io.github.chronosx88.yggdrasil.R import org.yggdrasil.app.crispa.R
import io.github.chronosx88.yggdrasil.models.DNSInfo import org.yggdrasil.app.crispa.models.DNSInfo
class SelectDNSInfoListAdapter( class SelectDNSInfoListAdapter(
context: Context, context: Context,

View File

@ -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.ClipData
import android.content.ClipboardManager import android.content.ClipboardManager
@ -9,8 +9,8 @@ import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.* import android.widget.*
import io.github.chronosx88.yggdrasil.R import org.yggdrasil.app.crispa.R
import io.github.chronosx88.yggdrasil.models.PeerInfo import org.yggdrasil.app.crispa.models.PeerInfo
class SelectPeerInfoListAdapter( class SelectPeerInfoListAdapter(
context: Context, context: Context,

View File

@ -1,4 +1,4 @@
package io.github.chronosx88.yggdrasil.models.config package org.yggdrasil.app.crispa.models.config
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName

View File

@ -1,4 +1,4 @@
package io.github.chronosx88.yggdrasil.models.config package org.yggdrasil.app.crispa.models.config
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName

View File

@ -1,4 +1,4 @@
package io.github.chronosx88.yggdrasil.models.config package org.yggdrasil.app.crispa.models.config
import com.google.gson.annotations.SerializedName import com.google.gson.annotations.SerializedName

View File

@ -1,8 +1,8 @@
package io.github.chronosx88.yggdrasil.models.config package org.yggdrasil.app.crispa.models.config
import com.google.gson.Gson import com.google.gson.Gson
import io.github.chronosx88.yggdrasil.models.DNSInfo import org.yggdrasil.app.crispa.models.DNSInfo
import io.github.chronosx88.yggdrasil.models.PeerInfo import org.yggdrasil.app.crispa.models.PeerInfo
import org.acra.ACRA import org.acra.ACRA
import java.net.InetAddress import java.net.InetAddress
import java.net.InetSocketAddress import java.net.InetSocketAddress

View File

@ -1,4 +1,4 @@
package io.github.chronosx88.yggdrasil package org.yggdrasil.app.crispa
import org.junit.Test import org.junit.Test