gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-06 14:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2073 from nextcloud/chore/noid/compileSdk31

Browse Source 
Bump compile sdk to 31
This commit is contained in:
Andy Scherzinger 2022-05-19 20:39:57 +02:00 committed by GitHub
commit 4b7a0721c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -35,7 +35,7 @@ apply plugin: 'io.gitlab.arturbosch.detekt'
apply plugin: "org.jlleitschuh.gradle.ktlint" apply plugin: "org.jlleitschuh.gradle.ktlint"
android { android {
compileSdkVersion 30 compileSdkVersion 31
buildToolsVersion '32.0.0' buildToolsVersion '32.0.0'
defaultConfig { defaultConfig {
minSdkVersion 21 minSdkVersion 21

5
app/src/main/AndroidManifest.xml
View File

@ -38,6 +38,7 @@
android:name="android.permission.AUTHENTICATE_ACCOUNTS" android:name="android.permission.AUTHENTICATE_ACCOUNTS"
android:maxSdkVersion="22" /> android:maxSdkVersion="22" />
<uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.BLUETOOTH" />
<uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
<uses-permission android:name="android.permission.CAMERA" /> <uses-permission android:name="android.permission.CAMERA" />
<uses-permission <uses-permission
android:name="android.permission.GET_ACCOUNTS" android:name="android.permission.GET_ACCOUNTS"
@ -75,8 +76,8 @@
<!-- This permission is deprecated in Android P --> <!-- This permission is deprecated in Android P -->
<uses-permission android:name="android.permission.USE_FINGERPRINT" /> <uses-permission android:name="android.permission.USE_FINGERPRINT" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/> <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<application <application
android:name=".application.NextcloudTalkApplication" android:name=".application.NextcloudTalkApplication"

2
app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
View File

@ -209,7 +209,7 @@ class MainActivity : BaseActivity(), ActionBarProvider {
if (cursor != null) { if (cursor != null) {
if (cursor.moveToFirst()) { if (cursor.moveToFirst()) {
// userId @ server // userId @ server
userId = cursor.getString(cursor.getColumnIndex(ContactsContract.Data.DATA1)) userId = cursor.getString(cursor.getColumnIndexOrThrow(ContactsContract.Data.DATA1))
} }
cursor.close() cursor.close()

4
app/src/main/java/com/nextcloud/talk/controllers/ChatController.kt
View File

@ -1382,7 +1382,7 @@ class ChatController(args: Bundle) :
val cursor: Cursor? = activity?.contentResolver!!.query(contactUri, null, null, null, null) val cursor: Cursor? = activity?.contentResolver!!.query(contactUri, null, null, null, null)
if (cursor != null && cursor.moveToFirst()) { if (cursor != null && cursor.moveToFirst()) {
val id = cursor.getString(cursor.getColumnIndex(ContactsContract.Contacts._ID)) val id = cursor.getString(cursor.getColumnIndexOrThrow(ContactsContract.Contacts._ID))
val fileName = ContactUtils.getDisplayNameFromDeviceContact(context!!, id) + ".vcf" val fileName = ContactUtils.getDisplayNameFromDeviceContact(context!!, id) + ".vcf"
val file = File(context?.cacheDir, fileName) val file = File(context?.cacheDir, fileName)
writeContactToVcfFile(cursor, file) writeContactToVcfFile(cursor, file)
@ -1427,7 +1427,7 @@ class ChatController(args: Bundle) :
} }
private fun writeContactToVcfFile(cursor: Cursor, file: File) { private fun writeContactToVcfFile(cursor: Cursor, file: File) {
val lookupKey = cursor.getString(cursor.getColumnIndex(ContactsContract.Contacts.LOOKUP_KEY)) val lookupKey = cursor.getString(cursor.getColumnIndexOrThrow(ContactsContract.Contacts.LOOKUP_KEY))
val uri = Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_VCARD_URI, lookupKey) val uri = Uri.withAppendedPath(ContactsContract.Contacts.CONTENT_VCARD_URI, lookupKey)
val fd: AssetFileDescriptor = activity?.contentResolver!!.openAssetFileDescriptor(uri, "r")!! val fd: AssetFileDescriptor = activity?.contentResolver!!.openAssetFileDescriptor(uri, "r")!!

25
app/src/main/java/com/nextcloud/talk/jobs/ContactAddressBookWorker.kt
View File

@ -175,9 +175,11 @@ class ContactAddressBookWorker(val context: Context, workerParameters: WorkerPar
if (contactCursor.count > 0) { if (contactCursor.count > 0) {
contactCursor.moveToFirst() contactCursor.moveToFirst()
for (i in 0 until contactCursor.count) { for (i in 0 until contactCursor.count) {
val id = contactCursor.getString(contactCursor.getColumnIndex(ContactsContract.Contacts._ID)) val id = contactCursor.getString(contactCursor.getColumnIndexOrThrow(ContactsContract.Contacts._ID))
val lookup = val lookup =
contactCursor.getString(contactCursor.getColumnIndex(ContactsContract.Contacts.LOOKUP_KEY)) contactCursor.getString(
contactCursor.getColumnIndexOrThrow(ContactsContract.Contacts.LOOKUP_KEY)
)
deviceContactsWithNumbers[lookup] = getPhoneNumbersFromDeviceContact(id) deviceContactsWithNumbers[lookup] = getPhoneNumbersFromDeviceContact(id)
contactCursor.moveToNext() contactCursor.moveToNext()
} }
@ -228,13 +230,16 @@ class ContactAddressBookWorker(val context: Context, workerParameters: WorkerPar
if (rawContactsCursor.count > 0) { if (rawContactsCursor.count > 0) {
while (rawContactsCursor.moveToNext()) { while (rawContactsCursor.moveToNext()) {
val lookupKey = val lookupKey =
rawContactsCursor.getString(rawContactsCursor.getColumnIndex(ContactsContract.Data.LOOKUP_KEY)) rawContactsCursor.getString(
val contactId = rawContactsCursor.getColumnIndexOrThrow(ContactsContract.Data.LOOKUP_KEY)
rawContactsCursor.getString(rawContactsCursor.getColumnIndex(ContactsContract.Data.CONTACT_ID))
if (contactsWithAssociatedPhoneNumbers == null || !contactsWithAssociatedPhoneNumbers.containsKey(
lookupKey
) )
val contactId =
rawContactsCursor.getString(
rawContactsCursor.getColumnIndexOrThrow(ContactsContract.Data.CONTACT_ID)
)
if (contactsWithAssociatedPhoneNumbers == null ||
!contactsWithAssociatedPhoneNumbers.containsKey(lookupKey)
) { ) {
deleteLinkedAccount(contactId) deleteLinkedAccount(contactId)
} }
@ -302,7 +307,7 @@ class ContactAddressBookWorker(val context: Context, workerParameters: WorkerPar
if (contactCursor.count > 0) { if (contactCursor.count > 0) {
contactCursor.moveToFirst() contactCursor.moveToFirst()
val id = contactCursor.getString(contactCursor.getColumnIndex(ContactsContract.Contacts._ID)) val id = contactCursor.getString(contactCursor.getColumnIndexOrThrow(ContactsContract.Contacts._ID))
if (hasLinkedAccount(id)) { if (hasLinkedAccount(id)) {
return return
} }
@ -416,7 +421,7 @@ class ContactAddressBookWorker(val context: Context, workerParameters: WorkerPar
while (phonesNumbersCursor.moveToNext()) { while (phonesNumbersCursor.moveToNext()) {
numbers.add( numbers.add(
phonesNumbersCursor.getString( phonesNumbersCursor.getString(
phonesNumbersCursor.getColumnIndex(ContactsContract.CommonDataKinds.Phone.NUMBER) phonesNumbersCursor.getColumnIndexOrThrow(ContactsContract.CommonDataKinds.Phone.NUMBER)
) )
) )
} }

2
app/src/main/java/com/nextcloud/talk/utils/ContactUtils.kt
View File

@ -24,7 +24,7 @@ object ContactUtils {
while (nameCursor.moveToNext()) { while (nameCursor.moveToNext()) {
displayName = displayName =
nameCursor.getString( nameCursor.getString(
nameCursor.getColumnIndex(ContactsContract.CommonDataKinds.StructuredName.DISPLAY_NAME) nameCursor.getColumnIndexOrThrow(ContactsContract.CommonDataKinds.StructuredName.DISPLAY_NAME)
) )
} }
nameCursor.close() nameCursor.close()

2
app/src/main/java/com/nextcloud/talk/utils/UriUtils.kt
View File

@ -36,7 +36,7 @@ class UriUtils {
val cursor: Cursor? = context.contentResolver.query(uri, null, null, null, null) val cursor: Cursor? = context.contentResolver.query(uri, null, null, null, null)
try { try {
if (cursor != null && cursor.moveToFirst()) { if (cursor != null && cursor.moveToFirst()) {
filename = cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)) filename = cursor.getString(cursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME))
} }
} finally { } finally {
cursor?.close() cursor?.close()

8
app/src/main/java/com/nextcloud/talk/webrtc/MagicBluetoothManager.java
View File

@ -42,6 +42,7 @@ import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.media.AudioManager; import android.media.AudioManager;
import android.os.Build;
import android.os.Handler; import android.os.Handler;
import android.os.Looper; import android.os.Looper;
import android.os.Process; import android.os.Process;
@ -317,10 +318,9 @@ public class MagicBluetoothManager {
@SuppressLint("HardwareIds") @SuppressLint("HardwareIds")
protected void logBluetoothAdapterInfo(BluetoothAdapter localAdapter) { protected void logBluetoothAdapterInfo(BluetoothAdapter localAdapter) {
Log.d(TAG, "BluetoothAdapter: " Log.d(TAG, "BluetoothAdapter: "
+ "enabled=" + localAdapter.isEnabled() + ", " + "enabled=" + localAdapter.isEnabled() + ", "
+ "state=" + stateToString(localAdapter.getState()) + ", " + "state=" + stateToString(localAdapter.getState()) + ", "
+ "name=" + localAdapter.getName() + ", " + "name=" + localAdapter.getName());
+ "address=" + localAdapter.getAddress());
// Log the set of BluetoothDevice objects that are bonded (paired) to the local adapter. // Log the set of BluetoothDevice objects that are bonded (paired) to the local adapter.
Set<BluetoothDevice> pairedDevices = localAdapter.getBondedDevices(); Set<BluetoothDevice> pairedDevices = localAdapter.getBondedDevices();
if (!pairedDevices.isEmpty()) { if (!pairedDevices.isEmpty()) {