TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-20 18:48:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into photo-sending-bug

Browse Source
This commit is contained in:
nielsandriesse
2020-08-27 09:36:01 +10:00
parent b7a2de3572 a31c58a25a
commit d976861cb9
16 changed files with 52 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/org/thoughtcrime/securesms/components/emoji/EmojiVariationSelectorPopup.java
View File

@@ -1,18 +1,19 @@
package org.thoughtcrime.securesms.components.emoji;
import android.content.Context;
import android.os.Build;
import androidx.annotation.NonNull;
import android.view.LayoutInflater;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.PopupWindow;
import network.loki.messenger.R;
import androidx.annotation.NonNull;
import org.thoughtcrime.securesms.components.emoji.EmojiKeyboardProvider.EmojiEventListener;
import java.util.List;
import network.loki.messenger.R;
public class EmojiVariationSelectorPopup extends PopupWindow {
private final Context context;
@@ -29,10 +30,6 @@ public class EmojiVariationSelectorPopup extends PopupWindow {
setBackgroundDrawable(null);
setOutsideTouchable(true);
if (Build.VERSION.SDK_INT >= 21) {
setElevation(20);
}
}
public void setVariations(List<String> variations) {

4
src/org/thoughtcrime/securesms/loki/activities/CreateClosedGroupActivity.kt
View File

@@ -115,7 +115,7 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), LoaderM
return Toast.makeText(this, R.string.activity_create_closed_group_group_name_too_long_error, Toast.LENGTH_LONG).show()
}
val selectedMembers = this.selectContactsAdapter.selectedMembers
if (selectedMembers.count() < 2) {
if (selectedMembers.count() < 1) {
return Toast.makeText(this, R.string.activity_create_closed_group_not_enough_group_members_error, Toast.LENGTH_LONG).show()
}
if (selectedMembers.count() > ClosedGroupsProtocol.groupSizeLimit) { // Minus one because we're going to include self later
@@ -136,7 +136,7 @@ class CreateClosedGroupActivity : PassphraseRequiredActionBarActivity(), LoaderM
return Toast.makeText(this, R.string.activity_create_closed_group_group_name_too_long_error, Toast.LENGTH_LONG).show()
}
val selectedMembers = this.selectContactsAdapter.selectedMembers
if (selectedMembers.count() < 2) {
if (selectedMembers.count() < 1) {
return Toast.makeText(this, R.string.activity_create_closed_group_not_enough_group_members_error, Toast.LENGTH_LONG).show()
}
if (selectedMembers.count() > 10) {

2
src/org/thoughtcrime/securesms/loki/activities/EditClosedGroupActivity.kt
View File

@@ -223,7 +223,7 @@ class EditClosedGroupActivity : PassphraseRequiredActionBarActivity() {
isSSKBasedClosedGroup = false
}
if (members.size < 2) {
if (members.size < 1) {
return Toast.makeText(this, R.string.activity_edit_closed_group_not_enough_group_members_error, Toast.LENGTH_LONG).show()
}

14
src/org/thoughtcrime/securesms/util/ResUtil.java
View File

@@ -18,6 +18,7 @@
package org.thoughtcrime.securesms.util;
import android.content.Context;
import android.content.res.Resources;
import android.content.res.Resources.Theme;
import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
@@ -25,10 +26,14 @@ import androidx.annotation.ArrayRes;
import androidx.annotation.AttrRes;
import androidx.annotation.DimenRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import android.util.TypedValue;
import org.thoughtcrime.securesms.logging.Log;
public class ResUtil {
private static final String TAG = ResUtil.class.getSimpleName();
public static int getColor(Context context, @AttrRes int attr) {
final TypedArray styledAttributes = context.obtainStyledAttributes(new int[]{attr});
@@ -47,8 +52,15 @@ public class ResUtil {
return out.resourceId;
}
@Nullable
public static Drawable getDrawable(Context c, @AttrRes int attr) {
return ContextCompat.getDrawable(c, getDrawableRes(c, attr));
int drawableRes = getDrawableRes(c, attr);
if (drawableRes == 0) {
Log.e(TAG, "Cannot find a drawable resource associated with the attribute: " + attr,
new Resources.NotFoundException());
return null;
}
return ContextCompat.getDrawable(c, drawableRes);
}
public static int[] getResourceIds(Context c, @ArrayRes int array) {