more updates

openziti · Jul 25, 2023 · 00058b3 · 00058b3
1 parent ecd0b2b
commit 00058b3
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 30 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -6,6 +6,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <application
         android:name=".ZitiMobileEdgeApp"
@@ -35,7 +36,6 @@
         <activity
             android:name=".ZitiMobileEdgeActivity"
             android:exported="true"
-            android:label="@string/app_name"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

diff --git a/app/src/main/java/org/openziti/mobile/ZitiVPNService.kt b/app/src/main/java/org/openziti/mobile/ZitiVPNService.kt
@@ -19,10 +19,15 @@ import android.os.IBinder
 import android.system.OsConstants
 import android.util.Log
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
-import kotlinx.coroutines.*
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Job
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.asCoroutineDispatcher
+import kotlinx.coroutines.cancel
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.flow.MutableStateFlow
-import kotlinx.coroutines.flow.collect
+import kotlinx.coroutines.job
+import kotlinx.coroutines.launch
 import org.openziti.android.Ziti
 import org.openziti.mobile.net.PacketRouter
 import org.openziti.mobile.net.PacketRouterImpl
@@ -33,7 +38,6 @@ import java.io.Writer
 import java.nio.ByteBuffer
 import java.time.Duration
 import java.util.concurrent.Executors
-import kotlin.coroutines.CoroutineContext
 
 
 class ZitiVPNService : VpnService(), CoroutineScope {
@@ -101,7 +105,7 @@ class ZitiVPNService : VpnService(), CoroutineScope {
     }
 
     private fun setNetworks() {
-        val nwrks = networks()
+//        val nwrks = networks()
         runCatching {
            // setUnderlyingNetworks(nwrks)
         }.onFailure {

diff --git a/app/src/main/java/org/openziti/mobile/debug/DebugInfoActivity.kt b/app/src/main/java/org/openziti/mobile/debug/DebugInfoActivity.kt
@@ -5,19 +5,14 @@
 package org.openziti.mobile.debug
 
 import android.os.Bundle
-import com.google.android.material.floatingactionbutton.FloatingActionButton
-import com.google.android.material.snackbar.Snackbar
+import androidx.fragment.app.FragmentActivity
 import com.google.android.material.tabs.TabLayout
-import androidx.viewpager.widget.ViewPager
-import androidx.appcompat.app.AppCompatActivity
-import android.view.Menu
-import android.view.MenuItem
-import org.openziti.mobile.debug.SectionsPagerAdapter
+import com.google.android.material.tabs.TabLayoutMediator
 import org.openziti.mobile.databinding.ActivityDebugInfoBinding
 import org.openziti.util.DebugInfoProvider
-import java.util.*
+import java.util.ServiceLoader
 
-class DebugInfoActivity : AppCompatActivity() {
+class DebugInfoActivity : FragmentActivity() {
 
     internal val contentMap: List<Pair<String, DebugInfoProvider>>
     init {
@@ -26,21 +21,24 @@ class DebugInfoActivity : AppCompatActivity() {
     }
 
     private lateinit var binding: ActivityDebugInfoBinding
-    private lateinit var sectionsPagerAdapter: SectionsPagerAdapter
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
         binding = ActivityDebugInfoBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        val viewPager: ViewPager = binding.viewPager
-        viewPager.adapter = SectionsPagerAdapter(this, supportFragmentManager).apply {
+        val viewPager = binding.viewPager
+        val adapter = SectionsPagerAdapter(this).apply {
             names = contentMap.map{ it.first }.toList()
         }
 
+        viewPager.adapter = adapter
+
         val tabs: TabLayout = binding.tabs
-        tabs.setupWithViewPager(viewPager)
+        TabLayoutMediator(tabs, viewPager) { tab, pos ->
+            tab.text = adapter.names[pos]
+        }.attach()
     }
 
     internal fun getSectionProvider(section: String): DebugInfoProvider? {

diff --git a/app/src/main/java/org/openziti/mobile/debug/SectionsPagerAdapter.kt b/app/src/main/java/org/openziti/mobile/debug/SectionsPagerAdapter.kt
@@ -4,25 +4,20 @@
 
 package org.openziti.mobile.debug
 
-import android.content.Context
 import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentManager
-import androidx.fragment.app.FragmentPagerAdapter
+import androidx.fragment.app.FragmentActivity
+import androidx.viewpager2.adapter.FragmentStateAdapter
 
 /**
- * A [FragmentPagerAdapter] that returns a fragment corresponding to
+ * A [FragmentStateAdapter] that returns a fragment corresponding to
  * one of the sections/tabs/pages.
  */
-class SectionsPagerAdapter(private val context: Context, fm: FragmentManager) :
-    FragmentPagerAdapter(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) {
-
+class SectionsPagerAdapter(act: FragmentActivity) : FragmentStateAdapter(act) {
     lateinit var names: List<String>
-    override fun getItem(position: Int): Fragment {
+    override fun createFragment(position: Int): Fragment {
         val name = names[position]
         return DebugInfoFragment.newInstance(name)
     }
 
-    override fun getPageTitle(position: Int): CharSequence = names[position]
-
-    override fun getCount(): Int = names.size
+    override fun getItemCount(): Int = names.size
 }
diff --git a/app/src/main/res/layout/activity_debug_info.xml b/app/src/main/res/layout/activity_debug_info.xml
@@ -32,7 +32,7 @@
             android:layout_height="wrap_content" />
     </com.google.android.material.appbar.AppBarLayout>
 
-    <androidx.viewpager.widget.ViewPager
+    <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/view_pager"
         android:layout_width="match_parent"
         android:layout_height="match_parent"