jp/baresip-studio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Migraded project to AndroidX.

Browse Source
This commit is contained in:
Juha Heinanen
2020-04-09 16:25:57 +03:00
parent 15d98191b3
commit 8124c98e76
24 changed files with 60 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/build.gradle
View File

@ -44,11 +44,12 @@ android {
dependencies { dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs') implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'com.android.support:design:28.0.0' implementation 'com.google.android.material:material:1.1.0'
implementation 'com.android.support:cardview-v7:28.0.0' implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
} }
repositories { repositories {

4
app/src/main/kotlin/com/tutpro/baresip/AboutActivity.kt
View File

@ -3,8 +3,8 @@ package com.tutpro.baresip
import android.app.Activity import android.app.Activity
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.support.v4.text.HtmlCompat import androidx.core.text.HtmlCompat
import android.support.v7.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import android.text.method.LinkMovementMethod import android.text.method.LinkMovementMethod
import android.view.MenuItem import android.view.MenuItem
import android.widget.TextView import android.widget.TextView

2
app/src/main/kotlin/com/tutpro/baresip/AccountActivity.kt
View File

@ -3,7 +3,7 @@ package com.tutpro.baresip
import android.app.Activity import android.app.Activity
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.support.v7.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import android.view.View import android.view.View

2
app/src/main/kotlin/com/tutpro/baresip/AccountListAdapter.kt
View File

@ -4,7 +4,7 @@ import android.app.Activity
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.support.v7.app.AlertDialog import androidx.appcompat.app.AlertDialog
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup

4
app/src/main/kotlin/com/tutpro/baresip/AccountsActivity.kt
View File

@ -3,8 +3,8 @@ package com.tutpro.baresip
import android.app.Activity import android.app.Activity
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.support.v7.app.AlertDialog import androidx.appcompat.app.AlertDialog
import android.support.v7.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import android.text.method.HideReturnsTransformationMethod import android.text.method.HideReturnsTransformationMethod
import android.text.method.PasswordTransformationMethod import android.text.method.PasswordTransformationMethod
import android.view.LayoutInflater import android.view.LayoutInflater

23
app/src/main/kotlin/com/tutpro/baresip/BaresipService.kt
View File

@ -1,5 +1,6 @@
package com.tutpro.baresip package com.tutpro.baresip
import android.Manifest
import android.annotation.TargetApi import android.annotation.TargetApi
import android.app.* import android.app.*
import android.app.Notification.VISIBILITY_PUBLIC import android.app.Notification.VISIBILITY_PUBLIC
@ -11,13 +12,13 @@ import android.media.*
import android.net.* import android.net.*
import android.net.wifi.WifiManager import android.net.wifi.WifiManager
import android.os.* import android.os.*
import android.support.annotation.Keep import androidx.annotation.Keep
import android.support.v4.app.NotificationCompat import androidx.core.app.NotificationCompat
import android.view.View import android.view.View
import android.widget.RemoteViews import android.widget.RemoteViews
import android.support.v4.content.LocalBroadcastManager import androidx.localbroadcastmanager.content.LocalBroadcastManager
import android.support.v4.app.NotificationCompat.VISIBILITY_PRIVATE import androidx.core.app.NotificationCompat.VISIBILITY_PRIVATE
import android.support.v4.content.ContextCompat import androidx.core.content.ContextCompat
import android.provider.Settings import android.provider.Settings
import android.telephony.TelephonyManager import android.telephony.TelephonyManager
@ -359,7 +360,7 @@ class BaresipService: Service() {
newIntent.putExtra("callp", intent.getStringExtra("callp")) newIntent.putExtra("callp", intent.getStringExtra("callp"))
newIntent.putExtra("uri", intent.getStringExtra("uri")) newIntent.putExtra("uri", intent.getStringExtra("uri"))
startActivity(newIntent) startActivity(newIntent)
nm.cancel(BaresipService.TRANSFER_NOTIFICATION_ID) nm.cancel(TRANSFER_NOTIFICATION_ID)
} }
} }
@ -370,7 +371,7 @@ class BaresipService: Service() {
Log.w(LOG_TAG, "onStartCommand did not find call $callp") Log.w(LOG_TAG, "onStartCommand did not find call $callp")
else else
Api.call_notify_sipfrag(callp, 603, "Decline") Api.call_notify_sipfrag(callp, 603, "Decline")
nm.cancel(BaresipService.TRANSFER_NOTIFICATION_ID) nm.cancel(TRANSFER_NOTIFICATION_ID)
} }
"Message Show", "Message Reply" -> { "Message Show", "Message Reply" -> {
@ -381,7 +382,7 @@ class BaresipService: Service() {
newIntent.putExtra("uap", intent!!.getStringExtra("uap")) newIntent.putExtra("uap", intent!!.getStringExtra("uap"))
newIntent.putExtra("peer", intent.getStringExtra("peer")) newIntent.putExtra("peer", intent.getStringExtra("peer"))
startActivity(newIntent) startActivity(newIntent)
nm.cancel(BaresipService.MESSAGE_NOTIFICATION_ID) nm.cancel(MESSAGE_NOTIFICATION_ID)
} }
"Message Save" -> { "Message Save" -> {
@ -392,7 +393,7 @@ class BaresipService: Service() {
else else
ChatsActivity.saveUaMessage(ua.account.aor, ChatsActivity.saveUaMessage(ua.account.aor,
intent.getStringExtra("time").toLong()) intent.getStringExtra("time").toLong())
nm.cancel(BaresipService.MESSAGE_NOTIFICATION_ID) nm.cancel(MESSAGE_NOTIFICATION_ID)
} }
"Message Delete" -> { "Message Delete" -> {
@ -403,7 +404,7 @@ class BaresipService: Service() {
else else
ChatsActivity.deleteUaMessage(ua.account.aor, ChatsActivity.deleteUaMessage(ua.account.aor,
intent.getStringExtra("time").toLong()) intent.getStringExtra("time").toLong())
nm.cancel(BaresipService.MESSAGE_NOTIFICATION_ID) nm.cancel(MESSAGE_NOTIFICATION_ID)
} }
"UpdateNotification" -> { "UpdateNotification" -> {
@ -552,7 +553,7 @@ class BaresipService: Service() {
if ((Call.calls().size > 0) || if ((Call.calls().size > 0) ||
(tm.callState != TelephonyManager.CALL_STATE_IDLE) || (tm.callState != TelephonyManager.CALL_STATE_IDLE) ||
!Utils.checkPermission(applicationContext, !Utils.checkPermission(applicationContext,
android.Manifest.permission.RECORD_AUDIO)) { Manifest.permission.RECORD_AUDIO)) {
Log.d(LOG_TAG, "Auto-rejecting incoming call $uap/$callp/$peerUri") Log.d(LOG_TAG, "Auto-rejecting incoming call $uap/$callp/$peerUri")
Api.ua_hangup(uap, callp, 486, "Busy Here") Api.ua_hangup(uap, callp, 486, "Busy Here")
if (ua.account.callHistory) { if (ua.account.callHistory) {

4
app/src/main/kotlin/com/tutpro/baresip/CallListAdapter.kt
View File

@ -2,8 +2,8 @@ package com.tutpro.baresip
import android.content.Context import android.content.Context
import android.graphics.drawable.GradientDrawable import android.graphics.drawable.GradientDrawable
import android.support.v4.content.ContextCompat import androidx.core.content.ContextCompat
import android.support.v7.widget.CardView import androidx.cardview.widget.CardView
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup

4
app/src/main/kotlin/com/tutpro/baresip/CallsActivity.kt
View File

@ -5,8 +5,8 @@ import android.content.DialogInterface
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.os.SystemClock import android.os.SystemClock
import android.support.v7.app.AlertDialog import androidx.appcompat.app.AlertDialog
import android.support.v7.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import android.text.format.DateUtils.isToday import android.text.format.DateUtils.isToday
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem

6
app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt
View File

@ -4,9 +4,9 @@ import android.app.Activity
import android.content.* import android.content.*
import android.os.Bundle import android.os.Bundle
import android.os.SystemClock import android.os.SystemClock
import android.support.v4.content.LocalBroadcastManager import androidx.localbroadcastmanager.content.LocalBroadcastManager
import android.support.v7.app.AlertDialog import androidx.appcompat.app.AlertDialog
import android.support.v7.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import android.view.View import android.view.View

4
app/src/main/kotlin/com/tutpro/baresip/ChatListAdapter.kt
View File

@ -3,8 +3,8 @@ package com.tutpro.baresip
import android.content.Context import android.content.Context
import android.graphics.Typeface import android.graphics.Typeface
import android.graphics.drawable.GradientDrawable import android.graphics.drawable.GradientDrawable
import android.support.v4.content.ContextCompat import androidx.core.content.ContextCompat
import android.support.v7.widget.CardView import androidx.cardview.widget.CardView
import android.text.format.DateUtils.isToday import android.text.format.DateUtils.isToday
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View

4
app/src/main/kotlin/com/tutpro/baresip/ChatsActivity.kt
View File

@ -3,8 +3,8 @@ package com.tutpro.baresip
import android.app.Activity import android.app.Activity
import android.content.* import android.content.*
import android.os.Bundle import android.os.Bundle
import android.support.v7.app.AlertDialog import androidx.appcompat.app.AlertDialog
import android.support.v7.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import android.widget.* import android.widget.*

2
app/src/main/kotlin/com/tutpro/baresip/ConfigActivity.kt
View File

@ -5,7 +5,7 @@ import android.content.Intent
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.graphics.Color import android.graphics.Color
import android.os.Bundle import android.os.Bundle
import android.support.v7.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import android.util.TypedValue import android.util.TypedValue
import android.view.Gravity import android.view.Gravity
import android.view.Menu import android.view.Menu

4
app/src/main/kotlin/com/tutpro/baresip/ContactActivity.kt
View File

@ -5,13 +5,13 @@ import android.content.Intent
import android.graphics.Bitmap import android.graphics.Bitmap
import android.graphics.drawable.GradientDrawable import android.graphics.drawable.GradientDrawable
import android.os.Bundle import android.os.Bundle
import android.support.v7.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import android.widget.* import android.widget.*
import android.graphics.BitmapFactory import android.graphics.BitmapFactory
import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.BitmapDrawable
import android.support.v7.widget.CardView import androidx.cardview.widget.CardView
import android.view.View import android.view.View
import java.io.File import java.io.File

4
app/src/main/kotlin/com/tutpro/baresip/ContactListAdapter.kt
View File

@ -7,8 +7,8 @@ import android.content.Intent
import android.graphics.drawable.GradientDrawable import android.graphics.drawable.GradientDrawable
import android.os.Bundle import android.os.Bundle
import android.os.SystemClock import android.os.SystemClock
import android.support.v7.app.AlertDialog import androidx.appcompat.app.AlertDialog
import android.support.v7.widget.CardView import androidx.cardview.widget.CardView
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup

2
app/src/main/kotlin/com/tutpro/baresip/ContactsActivity.kt
View File

@ -4,7 +4,7 @@ import android.app.Activity
import android.content.* import android.content.*
import android.os.Bundle import android.os.Bundle
import android.os.SystemClock import android.os.SystemClock
import android.support.v7.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import android.view.MenuItem import android.view.MenuItem
import android.widget.ImageButton import android.widget.ImageButton
import android.widget.ListView import android.widget.ListView

6
app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
View File

@ -3,12 +3,12 @@ package com.tutpro.baresip
import android.Manifest import android.Manifest
import android.app.* import android.app.*
import android.content.* import android.content.*
import android.support.v7.app.AlertDialog import androidx.appcompat.app.AlertDialog
import android.support.v7.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.media.AudioManager import android.media.AudioManager
import android.os.* import android.os.*
import android.support.v4.content.LocalBroadcastManager import androidx.localbroadcastmanager.content.LocalBroadcastManager
import android.view.inputmethod.InputMethodManager import android.view.inputmethod.InputMethodManager
import android.text.InputType import android.text.InputType
import android.text.TextWatcher import android.text.TextWatcher

2
app/src/main/kotlin/com/tutpro/baresip/MessageListAdapter.kt
View File

@ -2,7 +2,7 @@ package com.tutpro.baresip
import android.content.Context import android.content.Context
import android.graphics.Typeface import android.graphics.Typeface
import android.support.v4.content.ContextCompat import androidx.core.content.ContextCompat
import android.text.format.DateUtils.isToday import android.text.format.DateUtils.isToday
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View

6
app/src/main/kotlin/com/tutpro/baresip/Utils.kt
View File

@ -3,7 +3,7 @@ package com.tutpro.baresip
import android.app.Activity import android.app.Activity
import android.app.ActivityManager import android.app.ActivityManager
import android.content.Context import android.content.Context
import android.support.v7.app.AlertDialog import androidx.appcompat.app.AlertDialog
import android.content.Intent import android.content.Intent
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.graphics.Bitmap import android.graphics.Bitmap
@ -12,8 +12,8 @@ import android.graphics.Color
import android.net.LinkAddress import android.net.LinkAddress
import android.net.LinkProperties import android.net.LinkProperties
import android.os.Bundle import android.os.Bundle
import android.support.v4.app.ActivityCompat import androidx.core.app.ActivityCompat
import android.support.v4.content.ContextCompat import androidx.core.content.ContextCompat
import android.text.Editable import android.text.Editable
import android.text.TextWatcher import android.text.TextWatcher

4
app/src/main/res/layout/activity_contact.xml
View File

@ -23,7 +23,7 @@
android:gravity="center" > android:gravity="center" >
</TextView> </TextView>
<android.support.v7.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/CardAvatar" android:id="@+id/CardAvatar"
android:layout_width="96dp" android:layout_width="96dp"
android:layout_height="96dp" android:layout_height="96dp"
@ -39,7 +39,7 @@
android:scaleType="centerCrop" > android:scaleType="centerCrop" >
</ImageView> </ImageView>
</android.support.v7.widget.CardView> </androidx.cardview.widget.CardView>
<TextView <TextView
android:id="@+id/NameTitle" android:id="@+id/NameTitle"

4
app/src/main/res/layout/call_row.xml
View File

@ -21,7 +21,7 @@
android:gravity="center" > android:gravity="center" >
</TextView> </TextView>
<android.support.v7.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/CardAvatar" android:id="@+id/CardAvatar"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
@ -37,7 +37,7 @@
android:scaleType="centerCrop" > android:scaleType="centerCrop" >
</ImageView> </ImageView>
</android.support.v7.widget.CardView> </androidx.cardview.widget.CardView>
<LinearLayout <LinearLayout
android:id="@+id/directions" android:id="@+id/directions"

4
app/src/main/res/layout/chat_row.xml
View File

@ -18,7 +18,7 @@
android:gravity="center" > android:gravity="center" >
</TextView> </TextView>
<android.support.v7.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/CardAvatar" android:id="@+id/CardAvatar"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
@ -35,7 +35,7 @@
android:scaleType="centerCrop" > android:scaleType="centerCrop" >
</ImageView> </ImageView>
</android.support.v7.widget.CardView> </androidx.cardview.widget.CardView>
<LinearLayout <LinearLayout
android:id="@+id/chat" android:id="@+id/chat"

4
app/src/main/res/layout/contact_row.xml
View File

@ -18,7 +18,7 @@
android:gravity="center" > android:gravity="center" >
</TextView> </TextView>
<android.support.v7.widget.CardView <androidx.cardview.widget.CardView
android:id="@+id/CardAvatar" android:id="@+id/CardAvatar"
android:layout_width="36dp" android:layout_width="36dp"
android:layout_height="36dp" android:layout_height="36dp"
@ -34,7 +34,7 @@
android:scaleType="centerCrop" > android:scaleType="centerCrop" >
</ImageView> </ImageView>
</android.support.v7.widget.CardView> </androidx.cardview.widget.CardView>
<TextView <TextView
android:id="@+id/contactName" android:id="@+id/contactName"

4
app/src/main/res/layout/password_dialog.xml
View File

@ -4,7 +4,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="20dp" > android:padding="20dp" >
<android.support.design.widget.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
@ -24,6 +24,6 @@
android:text="@string/show_password" android:text="@string/show_password"
android:checked="false"/> android:checked="false"/>
</android.support.design.widget.TextInputLayout> </com.google.android.material.textfield.TextInputLayout>
</FrameLayout> </FrameLayout>

4
gradle.properties
View File

@ -15,4 +15,6 @@
# When configured, Gradle will run in incubating parallel mode. # When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit # This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true # org.gradle.parallel=true
android.enableJetifier=true
android.useAndroidX=true