Browse Source

some fixes

mikhail 3 months ago
parent
commit
4a83a9b17c

+ 3 - 0
.idea/.gitignore

@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml

+ 2 - 2
app/build.gradle

@@ -66,7 +66,7 @@ dependencies {
 
     implementation  "androidx.room:room-ktx:2.3.0"
     implementation 'androidx.compose.material:material:1.0.4'
-    annotationProcessor  "androidx.room:room-compiler:2.3.0"
+    kapt "androidx.room:room-compiler:2.3.0"
     coreLibraryDesugaring  "com.android.tools:desugar_jdk_libs:1.1.5"
 
     implementation  "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
@@ -101,7 +101,7 @@ dependencies {
     implementation "com.squareup.okhttp3:okhttp:5.0.0-alpha.2" 
 
     implementation "com.squareup.retrofit2:converter-moshi:2.9.0"
-    annotationProcessor "com.squareup.moshi:moshi-kotlin-codegen:1.12.0"
+    kapt "com.squareup.moshi:moshi-kotlin-codegen:1.12.0"
     implementation "com.squareup.okhttp3:logging-interceptor:5.0.0-alpha.2" 
 
     implementation "com.jakewharton.timber:timber:5.0.1" 

+ 8 - 0
app/src/main/java/ru/mephi/voip/KoinModule.kt

@@ -4,9 +4,12 @@ import android.content.Context
 import android.content.SharedPreferences
 import android.preference.PreferenceManager
 import org.koin.android.ext.koin.androidApplication
+import org.koin.android.ext.koin.androidContext
 import org.koin.androidx.viewmodel.dsl.viewModel
 import org.koin.core.qualifier.named
 import org.koin.dsl.module
+import ru.mephi.voip.call.abto.AbtoApp
+import ru.mephi.voip.call.abto.CallEventsReceiver
 import ru.mephi.voip.data.network.api.ApiHelper
 import ru.mephi.voip.data.network.api.KtorApiService
 import ru.mephi.voip.data.repository.CatalogRepository
@@ -19,9 +22,14 @@ val koinModule = module {
     single { CatalogRepository() }
     single { ApiHelper() }
     single { KtorApiService() }
+    single { CallEventsReceiver(androidContext() as AbtoApp) }
     viewModel { ProfileViewModel(androidApplication(), get(named("account_prefs"))) }
 }
 
+val callModule = module {
+
+}
+
 private fun spAccounts(): SharedPreferences =
     PreferenceManager.getDefaultSharedPreferences(appContext)
 

+ 1 - 5
app/src/main/java/ru/mephi/voip/VoIPApplication.kt

@@ -14,10 +14,6 @@ class VoIPApplication : AbtoApp() {
 
         appContext = this
 
-        startKoin {
-            androidContext(this@VoIPApplication)
-            modules(koinModule)
-        }
         if (BuildConfig.DEBUG) {
             Timber.plant(Timber.DebugTree())
         }
@@ -27,7 +23,7 @@ class VoIPApplication : AbtoApp() {
         Room.databaseBuilder(
             this,
             CallDatabase::class.java,
-            "database.db"
+            "calls_database.db"
         ).allowMainThreadQueries().build()
     }
 

+ 11 - 0
app/src/main/java/ru/mephi/voip/call/AbtoViewModel.kt

@@ -0,0 +1,11 @@
+package ru.mephi.voip.call
+
+import android.app.Application
+import androidx.lifecycle.AndroidViewModel
+import org.abtollc.sdk.AbtoPhone
+import ru.mephi.voip.call.abto.AbtoApp
+
+open class AbtoViewModel(app: Application) : AndroidViewModel(app){
+    private val abtoApp = app as AbtoApp
+    var abtoPhone: AbtoPhone = abtoApp.abtoPhone
+}

+ 16 - 2
app/src/main/java/ru/mephi/voip/call/abto/AbtoApp.kt

@@ -3,12 +3,26 @@ package ru.mephi.voip.call.abto
 import android.content.IntentFilter
 import org.abtollc.sdk.AbtoApplication
 import org.abtollc.sdk.AbtoPhone
+import org.koin.android.ext.koin.androidContext
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
+import org.koin.core.context.GlobalContext
+import org.koin.core.context.startKoin
+import ru.mephi.voip.callModule
+import ru.mephi.voip.koinModule
+
+open class AbtoApp : AbtoApplication(), KoinComponent {
+    private val callEventsReceiver : CallEventsReceiver by inject()
 
-open class AbtoApp : AbtoApplication() {
-    private val callEventsReceiver = CallEventsReceiver()
     private var appInBackgroundHandler: AppInBackgroundHandler? = null
     override fun onCreate() {
         super.onCreate()
+
+        startKoin {
+            androidContext(this@AbtoApp)
+            modules(callModule, koinModule)
+        }
+
         app = this
         registerReceiver(callEventsReceiver, IntentFilter(AbtoPhone.ACTION_ABTO_CALL_EVENT))
         appInBackgroundHandler = AppInBackgroundHandler()

+ 7 - 3
app/src/main/java/ru/mephi/voip/call/abto/CallEventsReceiver.kt

@@ -13,10 +13,12 @@ import android.os.RemoteException
 import androidx.core.app.NotificationCompat
 import ru.mephi.voip.call.CallActivity
 import org.abtollc.sdk.AbtoPhone
+import org.koin.core.component.KoinComponent
 import ru.mephi.voip.R
 import timber.log.Timber
 
-class CallEventsReceiver : BroadcastReceiver() {
+class CallEventsReceiver(var abtoApp: AbtoApp) : BroadcastReceiver(), KoinComponent {
+
     override fun onReceive(context: Context, intent: Intent) {
         val bundle = intent.extras ?: return
         when {
@@ -31,7 +33,8 @@ class CallEventsReceiver : BroadcastReceiver() {
                 val callId = bundle.getInt(AbtoPhone.CALL_ID)
                 cancelIncCallNotification(context, callId)
                 try {
-                    AbtoApp.app?.abtoPhone?.rejectCall(callId)
+//                    AbtoApp.app?.abtoPhone?.rejectCall(callId)
+                    abtoApp.abtoPhone?.rejectCall(callId)
                 } catch (e: RemoteException) {
                     e.printStackTrace()
                 }
@@ -48,7 +51,8 @@ class CallEventsReceiver : BroadcastReceiver() {
         val intent = Intent(context, CallActivity::class.java)
         intent.putExtras(bundle)
 
-        if (!AbtoApp.app?.isAppInBackground!!) {
+//        if (!AbtoApp.app?.isAppInBackground!!) {
+        if (!abtoApp.isAppInBackground) {
             //App is foreground - start activity
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
             context.startActivity(intent)

+ 0 - 7
app/src/main/java/ru/mephi/voip/ui/profile/ProfileFragment.kt

@@ -1,6 +1,5 @@
 package ru.mephi.voip.ui.profile
 
-import android.content.SharedPreferences
 import android.graphics.Color.rgb
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -57,7 +56,6 @@ import ru.mephi.voip.data.utils.getActiveAccount
 
 class ProfileFragment : Fragment() {
     private val viewModel: ProfileViewModel by inject()
-    private val sp: SharedPreferences by inject(named("account_prefs"))
 
     @ExperimentalCoilApi
     @ExperimentalMaterialApi
@@ -73,11 +71,6 @@ class ProfileFragment : Fragment() {
             }
         }
     }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-//        sp = PreferenceManager.getDefaultSharedPreferences(requireContext())
-    }
 }
 
 //https://dev.to/davidibrahim/how-to-use-multiple-bottom-sheets-in-android-compose-382p

+ 7 - 7
app/src/main/java/ru/mephi/voip/ui/profile/ProfileViewModel.kt

@@ -4,18 +4,16 @@ import android.app.Application
 import android.content.SharedPreferences
 import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.mutableStateOf
-import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.viewModelScope
 import androidx.preference.PreferenceManager
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
-import org.abtollc.sdk.AbtoPhone
 import org.koin.core.component.KoinComponent
 import org.koin.java.KoinJavaComponent.inject
 import ru.mephi.voip.appContext
-import ru.mephi.voip.call.abto.AbtoApp
+import ru.mephi.voip.call.AbtoViewModel
 import ru.mephi.voip.data.model.Account
 import ru.mephi.voip.data.model.NameItem
 import ru.mephi.voip.data.network.api.KtorClientBuilder
@@ -24,13 +22,15 @@ import ru.mephi.voip.data.utils.SIP_ACCOUNTS
 import ru.mephi.voip.data.utils.getAccountsArray
 import ru.mephi.voip.data.utils.getAccountsJson
 
-class ProfileViewModel(app: Application, val sp: SharedPreferences) : AndroidViewModel(app),
+class ProfileViewModel(app: Application, val sp: SharedPreferences) : AbtoViewModel(app),
     KoinComponent {
-    var abtoPhone: AbtoPhone = AbtoApp.app!!.abtoPhone
 
-    //    private val sp: SharedPreferences by inject(named("account_prefs"))
     private var status: LiveData<String?> =
-        MutableLiveData(abtoPhone.getSipProfileState(abtoPhone.currentAccountId).statusText)
+        MutableLiveData(
+            if(abtoPhone.currentAccountId!=-1L)
+            abtoPhone.getSipProfileState(abtoPhone.currentAccountId).statusText
+        else
+            "")
 
     private val repository: CatalogRepository by inject(CatalogRepository::class.java)
 

+ 1 - 1
build.gradle

@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.5.20'
+    ext.kotlin_version = '1.5.30'
     repositories {
         google()
         mavenCentral()

BIN
gradle/wrapper/gradle-wrapper.jar


+ 6 - 0
gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Sun Oct 17 02:10:28 MSK 2021
+distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
+distributionPath=wrapper/dists
+zipStorePath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME

+ 185 - 0
gradlew

@@ -0,0 +1,185 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=`expr $i + 1`
+    done
+    case $i in
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=`save "$@"`
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+exec "$JAVACMD" "$@"

+ 89 - 0
gradlew.bat

@@ -0,0 +1,89 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega