- Small edits.
This commit is contained in:
@@ -46,7 +46,8 @@ class ChatListAdapter(private val cxt: Context, private var rows: ArrayList<Mess
|
|||||||
cardAvatarView.visibility = View.GONE
|
cardAvatarView.visibility = View.GONE
|
||||||
textAvatarView.setBackgroundResource(R.drawable.person_image)
|
textAvatarView.setBackgroundResource(R.drawable.person_image)
|
||||||
}
|
}
|
||||||
if (message.direction == R.drawable.arrow_down_green) {
|
if ((message.direction == R.drawable.arrow_down_green) ||
|
||||||
|
(message.direction == R.drawable.arrow_down_red)) {
|
||||||
layout.setBackgroundResource(R.drawable.message_in_bg)
|
layout.setBackgroundResource(R.drawable.message_in_bg)
|
||||||
} else {
|
} else {
|
||||||
layout.setBackgroundResource(R.drawable.message_out_bg)
|
layout.setBackgroundResource(R.drawable.message_out_bg)
|
||||||
|
|||||||
@@ -126,7 +126,6 @@ class ContactActivity : AppCompatActivity() {
|
|||||||
|
|
||||||
if (requestCode == READ_REQUEST_CODE && resultCode == Activity.RESULT_OK) {
|
if (requestCode == READ_REQUEST_CODE && resultCode == Activity.RESULT_OK) {
|
||||||
resultData?.data?.also { uri ->
|
resultData?.data?.also { uri ->
|
||||||
Log.d("Baresip", "Uri: $uri")
|
|
||||||
try {
|
try {
|
||||||
val inputStream = baseContext.contentResolver.openInputStream(uri)
|
val inputStream = baseContext.contentResolver.openInputStream(uri)
|
||||||
val avatarImage = BitmapFactory.decodeStream(inputStream)
|
val avatarImage = BitmapFactory.decodeStream(inputStream)
|
||||||
|
|||||||
@@ -972,7 +972,6 @@ class MainActivity : AppCompatActivity() {
|
|||||||
File(BaresipService.filesPath).walk().forEach {
|
File(BaresipService.filesPath).walk().forEach {
|
||||||
if (it.name.endsWith(".png")) files.add(it.name)
|
if (it.name.endsWith(".png")) files.add(it.name)
|
||||||
}
|
}
|
||||||
Log.d("Baresip", "Backing up files $files")
|
|
||||||
val backupFilePath = BaresipService.downloadsPath + "/baresip.bs"
|
val backupFilePath = BaresipService.downloadsPath + "/baresip.bs"
|
||||||
val zipFilePath = BaresipService.filesPath + "/baresip.zip"
|
val zipFilePath = BaresipService.filesPath + "/baresip.zip"
|
||||||
if (!Utils.zip(files, "baresip.zip")) {
|
if (!Utils.zip(files, "baresip.zip")) {
|
||||||
@@ -1011,7 +1010,6 @@ class MainActivity : AppCompatActivity() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
Utils.deleteFile(File(zipFilePath))
|
Utils.deleteFile(File(zipFilePath))
|
||||||
Log.d("Baresip", "Showing restart dialog")
|
|
||||||
val restartDialog = AlertDialog.Builder(this)
|
val restartDialog = AlertDialog.Builder(this)
|
||||||
restartDialog.setMessage(getString(R.string.restored))
|
restartDialog.setMessage(getString(R.string.restored))
|
||||||
restartDialog.setPositiveButton(getText(R.string.restart)) { dialog, _ ->
|
restartDialog.setPositiveButton(getText(R.string.restart)) { dialog, _ ->
|
||||||
|
|||||||
@@ -70,7 +70,6 @@ object Utils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun friendlyUri(uri: String, domain: String): String {
|
fun friendlyUri(uri: String, domain: String): String {
|
||||||
Log.d("Baresip", "Checking uri $uri and domain $domain")
|
|
||||||
var u = uri
|
var u = uri
|
||||||
if (uri.startsWith("<") && (uri.endsWith(">")))
|
if (uri.startsWith("<") && (uri.endsWith(">")))
|
||||||
u = uri.substring(1).substringBeforeLast(">")
|
u = uri.substring(1).substringBeforeLast(">")
|
||||||
|
|||||||
@@ -27,7 +27,7 @@
|
|||||||
android:transcriptMode="alwaysScroll"
|
android:transcriptMode="alwaysScroll"
|
||||||
android:stackFromBottom="true"
|
android:stackFromBottom="true"
|
||||||
android:divider="#00000000"
|
android:divider="#00000000"
|
||||||
android:dividerHeight="10dp" >
|
android:dividerHeight="16dp" >
|
||||||
</ListView>
|
</ListView>
|
||||||
|
|
||||||
<AutoCompleteTextView
|
<AutoCompleteTextView
|
||||||
|
|||||||
@@ -55,8 +55,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_marginStart="5dp"
|
android:layout_marginStart="5dp"
|
||||||
android:textSize="16sp"
|
android:textSize="18sp"
|
||||||
android:textStyle="bold"
|
|
||||||
android:text="" >
|
android:text="" >
|
||||||
</TextView>
|
</TextView>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user