gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 11:39:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

create new capabilities util add license header and format kotlin code

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2022-06-20 13:46:32 +02:00
parent 75c8625aee
commit 5ffa3c44fd
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
15 changed files with 335 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -65,7 +65,6 @@ import io.reactivex.schedulers.Schedulers
import io.requery.Persistable
import io.requery.android.sqlcipher.SqlCipherDatabaseSource
import io.requery.reactivex.ReactiveEntityStore
import kotlinx.coroutines.DelicateCoroutinesApi
import kotlinx.coroutines.GlobalScope
import kotlinx.coroutines.launch
import org.parceler.Parcels

11
app/src/main/java/com/nextcloud/talk/controllers/SettingsController.kt
View File

@ -69,7 +69,6 @@ import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.setAppT
import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication
import com.nextcloud.talk.controllers.base.NewBaseController
import com.nextcloud.talk.controllers.util.viewBinding
import com.nextcloud.talk.data.storage.ArbitraryStoragesRepository
import com.nextcloud.talk.data.user.UsersRepository
import com.nextcloud.talk.data.user.model.UserNgEntity
import com.nextcloud.talk.databinding.ControllerSettingsBinding
@ -89,6 +88,7 @@ import com.nextcloud.talk.utils.NotificationUtils.getCallRingtoneUri
import com.nextcloud.talk.utils.NotificationUtils.getMessageRingtoneUri
import com.nextcloud.talk.utils.SecurityUtils
import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ARE_CALL_SOUNDS
import com.nextcloud.talk.utils.database.user.CapabilitiesNgUtil
import com.nextcloud.talk.utils.database.user.UserUtils
import com.nextcloud.talk.utils.preferences.MagicUserInputModule
import com.nextcloud.talk.utils.singletons.ApplicationWideMessageHolder
@ -103,7 +103,6 @@ import okhttp3.MediaType.Companion.toMediaTypeOrNull
import okhttp3.RequestBody
import java.net.URI
import java.net.URISyntaxException
import java.util.ArrayList
import java.util.Arrays
import java.util.Locale
import javax.inject.Inject
@ -190,7 +189,7 @@ class SettingsController : NewBaseController(R.layout.controller_settings) {
}
private fun setupPhoneBookIntegration() {
if (CapabilitiesUtil.isPhoneBookIntegrationAvailable(userRepository.getActiveUser())) {
if (CapabilitiesNgUtil.isPhoneBookIntegrationAvailable(userRepository.getActiveUser())) {
binding.settingsPhoneBookIntegration.visibility = View.VISIBLE
} else {
binding.settingsPhoneBookIntegration.visibility = View.GONE
@ -645,7 +644,7 @@ class SettingsController : NewBaseController(R.layout.controller_settings) {
private fun setupServerAgeWarning() {
when {
CapabilitiesUtil.isServerEOL(currentUser) -> {
CapabilitiesNgUtil.isServerEOL(currentUser) -> {
binding.serverAgeWarningText.setTextColor(ContextCompat.getColor((context)!!, R.color.nc_darkRed))
binding.serverAgeWarningText.setText(R.string.nc_settings_server_eol)
binding.serverAgeWarningIcon.setColorFilter(
@ -653,7 +652,7 @@ class SettingsController : NewBaseController(R.layout.controller_settings) {
PorterDuff.Mode.SRC_IN
)
}
CapabilitiesUtil.isServerAlmostEOL(currentUser) -> {
CapabilitiesNgUtil.isServerAlmostEOL(currentUser) -> {
binding.serverAgeWarningText.setTextColor(
ContextCompat.getColor((context)!!, R.color.nc_darkYellow)
)
@ -685,7 +684,7 @@ class SettingsController : NewBaseController(R.layout.controller_settings) {
if (CapabilitiesUtil.isReadStatusAvailable(userUtils.currentUser)) {
(binding.settingsReadPrivacy.findViewById<View>(R.id.mp_checkable) as Checkable).isChecked =
!CapabilitiesUtil.isReadStatusPrivate(currentUser)
!CapabilitiesNgUtil.isReadStatusPrivate(currentUser)
} else {
binding.settingsReadPrivacy.visibility = View.GONE
}

2
app/src/main/java/com/nextcloud/talk/dagger/modules/RepositoryModule.kt
View File

@ -2,6 +2,8 @@
* Nextcloud Talk application
*
* @author Álvaro Brey
* @author Andy Scherzinger
* Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
* Copyright (C) 2022 Álvaro Brey
* Copyright (C) 2022 Nextcloud GmbH
*

33
app/src/main/java/com/nextcloud/talk/data/source/local/Migrations.kt
View File

@ -1,12 +1,42 @@
/*
* Nextcloud Talk application
*
* @author Andy Scherzinger
* Copyright (C) 2022 Andy Scherzinger <infoi@andy-scherzinger.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.nextcloud.talk.data.source.local
import androidx.room.migration.Migration
import androidx.sqlite.db.SupportSQLiteDatabase
object Migrations {
val MIGRATION_6_8 = object : Migration(6, 8) {
override fun migrate(database: SupportSQLiteDatabase) {
migrateToRoom(database)
}
}
val MIGRATION_7_8 = object : Migration(7, 8) {
override fun migrate(database: SupportSQLiteDatabase) {
// Create the new tables
migrateToRoom(database)
}
}
fun migrateToRoom(database: SupportSQLiteDatabase) {
database.execSQL(
"CREATE TABLE User_new (" +
"id INTEGER NOT NULL, " +
@ -59,4 +89,3 @@ object Migrations {
database.execSQL("ALTER TABLE ArbitraryStorage_new RENAME TO ArbitraryStorage")
}
}
}

2
app/src/main/java/com/nextcloud/talk/data/source/local/TalkDatabase.kt
View File

@ -83,7 +83,7 @@ abstract class TalkDatabase : RoomDatabase() {
return Room
.databaseBuilder(context.applicationContext, TalkDatabase::class.java, dbName)
.openHelperFactory(factory)
.addMigrations(Migrations.MIGRATION_7_8)
.addMigrations(Migrations.MIGRATION_6_8, Migrations.MIGRATION_7_8)
.allowMainThreadQueries()
.addCallback(
object : RoomDatabase.Callback() {

1
app/src/main/java/com/nextcloud/talk/data/source/local/converters/ExternalSignalingServerConverter.kt
View File

@ -22,7 +22,6 @@ package com.nextcloud.talk.data.source.local.converters
import androidx.room.TypeConverter
import com.nextcloud.talk.models.ExternalSignalingServer
import com.nextcloud.talk.models.json.signaling.settings.SignalingSettings
class ExternalSignalingServerConverter {
val json = JsonConfiguration.customJsonConfiguration

2
app/src/main/java/com/nextcloud/talk/data/source/local/converters/JsonConfiguration.kt
View File

@ -27,7 +27,7 @@ import kotlinx.serialization.json.Json
sealed class JsonConfiguration {
companion object {
val customJsonConfiguration = Json {
prettyPrint = true;
prettyPrint = true
useArrayPolymorphism = true
}
}

1
app/src/main/java/com/nextcloud/talk/data/user/model/User.kt
View File

@ -23,7 +23,6 @@ import android.os.Parcelable
import com.nextcloud.talk.models.ExternalSignalingServer
import com.nextcloud.talk.models.json.capabilities.Capabilities
import com.nextcloud.talk.models.json.push.PushConfigurationState
import com.nextcloud.talk.models.json.signaling.settings.SignalingSettings
import com.nextcloud.talk.utils.ApiUtils
import kotlinx.android.parcel.Parcelize
import kotlinx.serialization.Serializable

51
app/src/main/java/com/nextcloud/talk/models/database/CapabilitiesUtil.java
View File

@ -24,7 +24,6 @@ package com.nextcloud.talk.models.database;
import android.util.Log;
import com.bluelinelabs.logansquare.LoganSquare;
import com.nextcloud.talk.data.user.model.UserNgEntity;
import com.nextcloud.talk.models.json.capabilities.Capabilities;
import java.io.IOException;
@ -67,18 +66,6 @@ public abstract class CapabilitiesUtil {
return false;
}
@Deprecated
public static boolean isServerEOL(@Nullable UserNgEntity user) {
// Capability is available since Talk 4 => Nextcloud 14 => Autmn 2018
return !hasSpreedFeatureCapability(user, "no-ping");
}
@Deprecated
public static boolean isServerAlmostEOL(@Nullable UserNgEntity user) {
// Capability is available since Talk 8 => Nextcloud 18 => January 2020
return !hasSpreedFeatureCapability(user, "chat-replies");
}
@Deprecated
public static boolean isServerEOL(@Nullable UserEntity user) {
// Capability is available since Talk 4 => Nextcloud 14 => Autmn 2018
@ -95,17 +82,6 @@ public abstract class CapabilitiesUtil {
return hasSpreedFeatureCapability(user, "chat-read-marker");
}
public static boolean hasSpreedFeatureCapability(@Nullable UserNgEntity user, String capabilityName) {
if (user != null && user.getCapabilities() != null) {
Capabilities capabilities = user.getCapabilities();
if (capabilities != null && capabilities.getSpreedCapability() != null &&
capabilities.getSpreedCapability().getFeatures() != null) {
return capabilities.getSpreedCapability().getFeatures().contains(capabilityName);
}
}
return false;
}
@Deprecated
public static boolean hasSpreedFeatureCapability(@Nullable UserEntity user, String capabilityName) {
if (user != null && user.getCapabilities() != null) {
@ -166,17 +142,6 @@ public abstract class CapabilitiesUtil {
return false;
}
public static boolean isPhoneBookIntegrationAvailable(@Nullable UserNgEntity user) {
if (user != null && user.getCapabilities() != null) {
Capabilities capabilities = user.getCapabilities();
return capabilities != null &&
capabilities.getSpreedCapability() != null &&
capabilities.getSpreedCapability().getFeatures() != null &&
capabilities.getSpreedCapability().getFeatures().contains("phonebook-search");
}
return false;
}
public static boolean isReadStatusAvailable(@Nullable UserEntity user) {
if (user != null && user.getCapabilities() != null) {
try {
@ -216,22 +181,6 @@ public abstract class CapabilitiesUtil {
return false;
}
public static boolean isReadStatusPrivate(@Nullable UserNgEntity user) {
if (user != null && user.getCapabilities() != null) {
Capabilities capabilities = user.getCapabilities();
if (capabilities != null &&
capabilities.getSpreedCapability() != null &&
capabilities.getSpreedCapability().getConfig() != null &&
capabilities.getSpreedCapability().getConfig().containsKey("chat")) {
HashMap<String, String> map = capabilities.getSpreedCapability().getConfig().get("chat");
if (map != null && map.containsKey("read-privacy")) {
return Integer.parseInt(map.get("read-privacy")) == 1;
}
}
}
return false;
}
public static boolean isUserStatusAvailable(@Nullable UserEntity user) {
if (user != null && user.getCapabilities() != null) {
try {

1
app/src/main/java/com/nextcloud/talk/models/database/User.java
View File

@ -29,7 +29,6 @@ import io.requery.Entity;
import io.requery.Generated;
import io.requery.Key;
import io.requery.Persistable;
import io.requery.Table;
@Entity
public interface User extends Parcelable, Persistable, Serializable {

11
app/src/main/java/com/nextcloud/talk/users/UserManager.kt
View File

@ -114,7 +114,8 @@ class UserManager internal constructor(private val userRepository: UsersReposito
}
suspend fun createOrUpdateUser(
username: String?, token: String?,
username: String?,
token: String?,
serverUrl: String?,
displayName: String?,
pushConfigurationState: String?,
@ -166,8 +167,12 @@ class UserManager internal constructor(private val userRepository: UsersReposito
if (token != null && token != user.token) {
user.token = token
}
if (displayName != null && user.displayName == null || displayName != null && (user.displayName
!= null) && displayName != user.displayName
if (
displayName != null &&
user.displayName == null ||
displayName != null &&
(user.displayName != null) &&
displayName != user.displayName
) {
user.displayName = displayName
}

230
app/src/main/java/com/nextcloud/talk/utils/database/user/CapabilitiesNgUtil.java Normal file
View File

@ -0,0 +1,230 @@
/*
* Nextcloud Talk application
*
* @author Andy Scherzinger
* @author Mario Danic
* Copyright (C) 2021 Andy Scherzinger (info@andy-scherzinger.de)
* Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.nextcloud.talk.utils.database.user;
import com.nextcloud.talk.data.user.model.UserNgEntity;
import com.nextcloud.talk.models.json.capabilities.Capabilities;
import java.util.HashMap;
import java.util.Map;
import androidx.annotation.Nullable;
public abstract class CapabilitiesNgUtil {
private static final String TAG = CapabilitiesNgUtil.class.getSimpleName();
public static boolean hasNotificationsCapability(@Nullable UserNgEntity user, String capabilityName) {
if (user != null && user.getCapabilities() != null) {
Capabilities capabilities = user.getCapabilities();
if (capabilities.getNotificationsCapability() != null &&
capabilities.getNotificationsCapability().getFeatures() != null) {
return capabilities.getSpreedCapability().getFeatures().contains(capabilityName);
}
}
return false;
}
public static boolean hasExternalCapability(@Nullable UserNgEntity user, String capabilityName) {
if (user != null && user.getCapabilities() != null) {
Capabilities capabilities = user.getCapabilities();
if (capabilities.getExternalCapability() != null &&
capabilities.getExternalCapability().containsKey("v1")) {
return capabilities.getExternalCapability().get("v1").contains(capabilityName);
}
}
return false;
}
public static boolean isServerEOL(@Nullable UserNgEntity user) {
// Capability is available since Talk 4 => Nextcloud 14 => Autmn 2018
return !hasSpreedFeatureCapability(user, "no-ping");
}
public static boolean isServerAlmostEOL(@Nullable UserNgEntity user) {
// Capability is available since Talk 8 => Nextcloud 18 => January 2020
return !hasSpreedFeatureCapability(user, "chat-replies");
}
public static boolean canSetChatReadMarker(@Nullable UserNgEntity user) {
return hasSpreedFeatureCapability(user, "chat-read-marker");
}
public static boolean hasSpreedFeatureCapability(@Nullable UserNgEntity user, String capabilityName) {
if (user != null && user.getCapabilities() != null) {
Capabilities capabilities = user.getCapabilities();
if (capabilities != null && capabilities.getSpreedCapability() != null &&
capabilities.getSpreedCapability().getFeatures() != null) {
return capabilities.getSpreedCapability().getFeatures().contains(capabilityName);
}
}
return false;
}
public static Integer getMessageMaxLength(@Nullable UserNgEntity user) {
if (user != null && user.getCapabilities() != null) {
Capabilities capabilities = user.getCapabilities();
if (capabilities != null &&
capabilities.getSpreedCapability() != null &&
capabilities.getSpreedCapability().getConfig() != null &&
capabilities.getSpreedCapability().getConfig().containsKey("chat")) {
HashMap<String, String> chatConfigHashMap = capabilities
.getSpreedCapability()
.getConfig()
.get("chat");
if (chatConfigHashMap != null && chatConfigHashMap.containsKey("max-length")) {
int chatSize = Integer.parseInt(chatConfigHashMap.get("max-length"));
if (chatSize > 0) {
return chatSize;
} else {
return 1000;
}
}
}
}
return 1000;
}
public static boolean isPhoneBookIntegrationAvailable(@Nullable UserNgEntity user) {
if (user != null && user.getCapabilities() != null) {
Capabilities capabilities = user.getCapabilities();
return capabilities != null &&
capabilities.getSpreedCapability() != null &&
capabilities.getSpreedCapability().getFeatures() != null &&
capabilities.getSpreedCapability().getFeatures().contains("phonebook-search");
}
return false;
}
public static boolean isReadStatusAvailable(@Nullable UserNgEntity user) {
if (user != null && user.getCapabilities() != null) {
Capabilities capabilities = user.getCapabilities();
if (capabilities != null &&
capabilities.getSpreedCapability() != null &&
capabilities.getSpreedCapability().getConfig() != null &&
capabilities.getSpreedCapability().getConfig().containsKey("chat")) {
Map<String, String> map = capabilities.getSpreedCapability().getConfig().get("chat");
return map != null && map.containsKey("read-privacy");
}
}
return false;
}
public static boolean isReadStatusPrivate(@Nullable UserNgEntity user) {
if (user != null && user.getCapabilities() != null) {
Capabilities capabilities = user.getCapabilities();
if (capabilities != null &&
capabilities.getSpreedCapability() != null &&
capabilities.getSpreedCapability().getConfig() != null &&
capabilities.getSpreedCapability().getConfig().containsKey("chat")) {
HashMap<String, String> map = capabilities.getSpreedCapability().getConfig().get("chat");
if (map != null && map.containsKey("read-privacy")) {
return Integer.parseInt(map.get("read-privacy")) == 1;
}
}
}
return false;
}
public static boolean isUserStatusAvailable(@Nullable UserNgEntity user) {
if (user != null && user.getCapabilities() != null) {
Capabilities capabilities = user.getCapabilities();
if (capabilities.getUserStatusCapability() != null &&
capabilities.getUserStatusCapability().getEnabled() &&
capabilities.getUserStatusCapability().getSupportsEmoji()) {
return true;
}
}
return false;
}
public static String getAttachmentFolder(@Nullable UserNgEntity user) {
if (user != null && user.getCapabilities() != null) {
Capabilities capabilities = user.getCapabilities();
if (capabilities != null &&
capabilities.getSpreedCapability() != null &&
capabilities.getSpreedCapability().getConfig() != null &&
capabilities.getSpreedCapability().getConfig().containsKey("attachments")) {
HashMap<String, String> map = capabilities.getSpreedCapability().getConfig().get("attachments");
if (map != null && map.containsKey("folder")) {
return map.get("folder");
}
}
}
return "/Talk";
}
public static String getServerName(@Nullable UserNgEntity user) {
if (user != null && user.getCapabilities() != null) {
Capabilities capabilities = user.getCapabilities();
if (capabilities != null && capabilities.getThemingCapability() != null) {
return capabilities.getThemingCapability().getName();
}
}
return "";
}
// TODO later avatar can also be checked via user fields, for now it is in Talk capability
public static boolean isAvatarEndpointAvailable(@Nullable UserNgEntity user) {
if (user != null && user.getCapabilities() != null) {
Capabilities capabilities = user.getCapabilities();
return (capabilities != null &&
capabilities.getSpreedCapability() != null &&
capabilities.getSpreedCapability().getFeatures() != null &&
capabilities.getSpreedCapability().getFeatures().contains("temp-user-avatar-api"));
}
return false;
}
public static boolean canEditScopes(@Nullable UserNgEntity user) {
if (user != null && user.getCapabilities() != null) {
Capabilities capabilities = user.getCapabilities();
return (capabilities != null &&
capabilities.getProvisioningCapability() != null &&
capabilities.getProvisioningCapability().getAccountPropertyScopesVersion() != null &&
capabilities.getProvisioningCapability().getAccountPropertyScopesVersion() > 1);
}
return false;
}
public static boolean isAbleToCall(@Nullable UserNgEntity user) {
if (user != null && user.getCapabilities() != null) {
Capabilities capabilities = user.getCapabilities();
if (capabilities != null &&
capabilities.getSpreedCapability() != null &&
capabilities.getSpreedCapability().getConfig() != null &&
capabilities.getSpreedCapability().getConfig().containsKey("call") &&
capabilities.getSpreedCapability().getConfig().get("call") != null &&
capabilities.getSpreedCapability().getConfig().get("call").containsKey("enabled")) {
return Boolean.parseBoolean(
capabilities.getSpreedCapability().getConfig().get("call").get("enabled"));
} else {
// older nextcloud versions without the capability can't disable the calls
return true;
}
}
return false;
}
public static boolean isUnifiedSearchAvailable(@Nullable final UserNgEntity user) {
return hasSpreedFeatureCapability(user, "unified-search");
}
}