Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev #264

Merged
merged 2 commits into from
Aug 22, 2024
Merged

Dev #264

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,13 @@ public interface ThreadedConversationsDao {
@Query("SELECT Conversation.address, " +
"Conversation.text as snippet, " +
"Conversation.thread_id, " +
"Conversation.date, Conversation.type, Conversation.read, " +
"Conversation.date, Conversation.type, " +
"ThreadedConversations.msg_count, ThreadedConversations.is_archived, " +
"ThreadedConversations.is_blocked, ThreadedConversations.is_read, " +
"ThreadedConversations.is_shortcode, ThreadedConversations.contact_name, " +
"ThreadedConversations.is_mute, ThreadedConversations.is_secured, " +
"ThreadedConversations.isSelf, ThreadedConversations.subscription_id " +
"ThreadedConversations.isSelf, ThreadedConversations.subscription_id, " +
"ThreadedConversations.formatted_datetime " +
"FROM Conversation, ThreadedConversations WHERE " +
"Conversation.type = :type AND ThreadedConversations.thread_id = Conversation.thread_id " +
"ORDER BY Conversation.date DESC")
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:8.5.0'
classpath 'com.android.tools.build:gradle:8.5.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.0"

// NOTE: Do not place your application dependencies here; they belong
Expand Down
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ org.gradle.jvmargs=-Xmx4G -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode.
# 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
# org.gradle.parallel=true
org.gradle.parallel=true
org.gradle.daemon=true
# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app"s APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
Expand Down
Loading