aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build.gradle12
-rw-r--r--gradle/wrapper/gradle-wrapper.properties2
-rw-r--r--libs/xmpp-addr/build.gradle2
-rw-r--r--src/main/java/de/pixart/messenger/ui/ConversationFragment.java6
-rw-r--r--src/main/java/de/pixart/messenger/ui/MediaBrowserActivity.java5
-rw-r--r--src/main/res/menu/choose_attachment.xml5
-rw-r--r--src/main/res/menu/fragment_conversation.xml5
-rw-r--r--src/main/res/values/strings.xml1
8 files changed, 29 insertions, 9 deletions
diff --git a/build.gradle b/build.gradle
index 24300125a..07e99f588 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
google()
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.5.3'
+ classpath 'com.android.tools.build:gradle:3.6.1'
}
}
@@ -40,12 +40,12 @@ configurations {
dependencies {
implementation project(':libs:android-transcoder')
- playstoreImplementation('com.google.firebase:firebase-messaging:20.0.1') {
+ playstoreImplementation('com.google.firebase:firebase-messaging:20.1.3') {
exclude group: 'com.google.firebase', module: 'firebase-core'
exclude group: 'com.google.firebase', module: 'firebase-analytics'
exclude group: 'com.google.firebase', module: 'firebase-measurement-connector'
}
- playstoreImplementation 'com.android.installreferrer:installreferrer:1.1.1'
+ playstoreImplementation 'com.android.installreferrer:installreferrer:1.1.2'
implementation 'org.sufficientlysecure:openpgp-api:10.0'
implementation('com.theartofdev.edmodo:android-image-cropper:2.8.0') {
exclude group: 'com.android.support', module: 'appcompat-v7'
@@ -71,8 +71,8 @@ dependencies {
gitImplementation 'androidx.emoji:emoji-bundled:1.0.0'
implementation 'com.google.android.material:material:1.0.0' // higher versions cause strange fab design
implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.10.0'
- implementation 'com.google.android.exoplayer:exoplayer-core:2.11.1'
- implementation 'com.google.android.exoplayer:exoplayer-ui:2.11.1'
+ implementation 'com.google.android.exoplayer:exoplayer-core:2.11.3'
+ implementation 'com.google.android.exoplayer:exoplayer-ui:2.11.3'
implementation 'pub.devrel:easypermissions:3.0.0' // version >= 3.0.0 needs android X libraries
implementation 'com.wefika:flowlayout:0.4.1'
implementation 'com.googlecode.ez-vcard:ez-vcard:0.10.5'
@@ -84,7 +84,7 @@ dependencies {
implementation 'org.osmdroid:osmdroid-android:6.1.5'
implementation 'com.leinardi.android:speed-dial:3.1.1' // version >= 3.0.0 needs android X libraries
implementation 'com.squareup.picasso:picasso:2.71828'
- implementation 'com.squareup.okhttp3:okhttp:3.12.8' // versions > 3.12.x don't support API level < 21 anymore
+ implementation 'com.squareup.okhttp3:okhttp:3.12.10' // versions > 3.12.x don't support API level < 21 anymore
implementation 'com.squareup.retrofit2:retrofit:2.6.4' //retrofit needs to stick with 2.6.x (https://github.com/square/retrofit/blob/master/CHANGELOG.md)
implementation 'com.squareup.retrofit2:converter-gson:2.6.4'
implementation 'com.google.guava:guava:28.2-android'
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9cbdf2b53..32b31286a 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/libs/xmpp-addr/build.gradle b/libs/xmpp-addr/build.gradle
index 2d30752c4..0675efe7d 100644
--- a/libs/xmpp-addr/build.gradle
+++ b/libs/xmpp-addr/build.gradle
@@ -7,7 +7,7 @@ repositories {
}
dependencies {
- implementation 'rocks.xmpp:precis:1.0.0'
+ implementation 'rocks.xmpp:precis:1.1.0'
}
sourceCompatibility = "8"
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 7df639222..82b3cfca1 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -632,6 +632,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
popup.setOnMenuItemClickListener(attachmentItem -> {
switch (attachmentItem.getItemId()) {
case R.id.attach_choose_picture:
+ case R.id.attach_choose_video:
case R.id.attach_take_picture:
case R.id.attach_record_video:
case R.id.attach_choose_file:
@@ -996,6 +997,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
case ATTACHMENT_CHOICE_CHOOSE_FILE:
case ATTACHMENT_CHOICE_RECORD_VIDEO:
case ATTACHMENT_CHOICE_RECORD_VOICE:
+ case ATTACHMENT_CHOICE_CHOOSE_VIDEO:
final Attachment.Type type = requestCode == ATTACHMENT_CHOICE_RECORD_VOICE ? Attachment.Type.RECORDING : Attachment.Type.FILE;
final List<Attachment> fileUris = Attachment.extractAttachments(getActivity(), data, type);
mediaPreviewAdapter.addMediaPreviews(fileUris);
@@ -1434,6 +1436,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
handleEncryptionSelection(item);
break;
case R.id.attach_choose_picture:
+ case R.id.attach_choose_video:
case R.id.attach_take_picture:
case R.id.attach_record_video:
case R.id.attach_choose_file:
@@ -1494,6 +1497,9 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
case R.id.attach_choose_picture:
attachFile(ATTACHMENT_CHOICE_CHOOSE_IMAGE);
break;
+ case R.id.attach_choose_video:
+ attachFile(ATTACHMENT_CHOICE_CHOOSE_VIDEO);
+ break;
case R.id.attach_take_picture:
attachFile(ATTACHMENT_CHOICE_TAKE_PHOTO);
break;
diff --git a/src/main/java/de/pixart/messenger/ui/MediaBrowserActivity.java b/src/main/java/de/pixart/messenger/ui/MediaBrowserActivity.java
index af4552079..b75af44e9 100644
--- a/src/main/java/de/pixart/messenger/ui/MediaBrowserActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/MediaBrowserActivity.java
@@ -3,6 +3,7 @@ package de.pixart.messenger.ui;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
+import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
@@ -13,6 +14,7 @@ import androidx.databinding.DataBindingUtil;
import java.util.ArrayList;
import java.util.List;
+import de.pixart.messenger.Config;
import de.pixart.messenger.R;
import de.pixart.messenger.databinding.ActivityMediaBrowserBinding;
import de.pixart.messenger.entities.Account;
@@ -41,7 +43,6 @@ public class MediaBrowserActivity extends XmppActivity implements OnMediaLoaded
@Override
protected void onStart() {
super.onStart();
- getPreferences().edit().putBoolean("show_videos_images_only", OnlyImagesVideos).apply();
filter(OnlyImagesVideos);
invalidateOptionsMenu();
refreshUiReal();
@@ -200,6 +201,8 @@ public class MediaBrowserActivity extends XmppActivity implements OnMediaLoaded
} else {
loadAttachments(allAttachments);
}
+ } else {
+ loadAttachments(allAttachments);
}
}
} \ No newline at end of file
diff --git a/src/main/res/menu/choose_attachment.xml b/src/main/res/menu/choose_attachment.xml
index a9a57404d..96e540f59 100644
--- a/src/main/res/menu/choose_attachment.xml
+++ b/src/main/res/menu/choose_attachment.xml
@@ -12,6 +12,11 @@
android:title="@string/attach_choose_picture" />
<item
+ android:id="@+id/attach_choose_video"
+ android:icon="?attr/ic_attach_video"
+ android:title="@string/attach_choose_video" />
+
+ <item
android:id="@+id/attach_take_picture"
android:icon="?attr/ic_attach_camera"
android:title="@string/action_take_photo" />
diff --git a/src/main/res/menu/fragment_conversation.xml b/src/main/res/menu/fragment_conversation.xml
index 8858d941d..ac7d8a1d2 100644
--- a/src/main/res/menu/fragment_conversation.xml
+++ b/src/main/res/menu/fragment_conversation.xml
@@ -43,6 +43,11 @@
android:title="@string/attach_choose_picture" />
<item
+ android:id="@+id/attach_choose_video"
+ android:icon="?attr/ic_attach_video"
+ android:title="@string/attach_choose_video" />
+
+ <item
android:id="@+id/attach_take_picture"
android:icon="?attr/ic_attach_camera"
android:title="@string/action_take_photo" />
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 280eeaceb..7fa728f54 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1004,4 +1004,5 @@
<string name="show_videos_images_only">Only images/videos</string>
<string name="show_avatar">Show avatar</string>
<string name="action_delete">Delete</string>
+ <string name="attach_choose_video">Choose video</string>
</resources>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-03 10:45:51 +0000