Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-14 11:49:04 +01:00
Code Issues Projects Releases Wiki Activity

Lambdas.

Browse Source
This commit is contained in:
akwizgran
2017-11-16 10:29:18 +00:00
committed by Torsten Grote
parent 27328afe3c
commit 5fa6b0ca1c
109 changed files with 2087 additions and 3450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
briar-android/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiDrawer.java
View File

@@ -18,7 +18,6 @@ import com.astuetz.PagerSlidingTabStrip.CustomTabProvider;
import org.briarproject.briar.R;
import org.thoughtcrime.securesms.components.RepeatableImageKey;
import org.thoughtcrime.securesms.components.RepeatableImageKey.KeyEventListener;
import org.thoughtcrime.securesms.components.emoji.EmojiPageView.EmojiSelectionListener;
import java.util.LinkedList;
@@ -78,11 +77,8 @@ public class EmojiDrawer extends LinearLayout {
RepeatableImageKey backspace =
(RepeatableImageKey) v.findViewById(R.id.backspace);
backspace.setOnKeyEventListener(new KeyEventListener() {
@Override
public void onKeyEvent() {
if (listener != null) listener.onKeyEvent(DELETE_KEY_EVENT);
}
backspace.setOnKeyEventListener(() -> {
if (listener != null) listener.onKeyEvent(DELETE_KEY_EVENT);
});
}
@@ -107,14 +103,10 @@ public class EmojiDrawer extends LinearLayout {
}
private void initializeEmojiGrid() {
pager.setAdapter(new EmojiPagerAdapter(getContext(),
models,
new EmojiSelectionListener() {
@Override
public void onEmojiSelected(String emoji) {
recentModel.onCodePointSelected(emoji);
if (listener != null) listener.onEmojiSelected(emoji);
}
pager.setAdapter(new EmojiPagerAdapter(getContext(), models,
emoji -> {
recentModel.onCodePointSelected(emoji);
if (listener != null) listener.onEmojiSelected(emoji);
}));
if (recentModel.getEmoji().length == 0) {

12
briar-android/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiPageView.java
View File

@@ -7,8 +7,6 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AbsListView;
import android.widget.AdapterView;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.BaseAdapter;
import android.widget.FrameLayout;
import android.widget.GridView;
@@ -42,13 +40,9 @@ public class EmojiPageView extends FrameLayout {
.getDimensionPixelSize(R.dimen.emoji_drawer_size) + 2 *
getResources().getDimensionPixelSize(
R.dimen.emoji_drawer_item_padding));
grid.setOnItemClickListener(new OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> parent, View view,
int position, long id) {
if (listener != null)
listener.onEmojiSelected(((EmojiView) view).getEmoji());
}
grid.setOnItemClickListener((parent, view1, position, id) -> {
if (listener != null)
listener.onEmojiSelected(((EmojiView) view1).getEmoji());
});
}

19
briar-android/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiProvider.java
View File

@@ -139,12 +139,7 @@ public class EmojiProvider {
drawInfo.page.get().addListener(new FutureTaskListener<Bitmap>() {
@Override
public void onSuccess(final Bitmap result) {
androidExecutor.runOnUiThread(new Runnable() {
@Override
public void run() {
drawable.setBitmap(result);
}
});
androidExecutor.runOnUiThread(() -> drawable.setBitmap(result));
}
@Override
@@ -260,14 +255,10 @@ public class EmojiProvider {
if (bitmap != null) return new ListenableFutureTask<>(bitmap);
}
if (task != null) return task;
Callable<Bitmap> callable = new Callable<Bitmap>() {
@Override
@Nullable
public Bitmap call() throws Exception {
if (LOG.isLoggable(INFO))
LOG.info("Loading page " + model.getSprite());
return loadPage();
}
Callable<Bitmap> callable = () -> {
if (LOG.isLoggable(INFO))
LOG.info("Loading page " + model.getSprite());
return loadPage();
};
task = new ListenableFutureTask<>(callable);
new AsyncTask<Void, Void, Void>() {

18
briar-android/src/main/java/org/thoughtcrime/securesms/components/emoji/RecentEmojiPageModel.java
View File

@@ -110,17 +110,13 @@ public class RecentEmojiPageModel implements EmojiPageModel {
}
private void save(final String serialized) {
dbExecutor.execute(new Runnable() {
@Override
public void run() {
Settings settings = new Settings();
settings.put(EMOJI_LRU_PREFERENCE, serialized);
try {
settingsManager.mergeSettings(settings, SETTINGS_NAMESPACE);
} catch (DbException e) {
if (LOG.isLoggable(WARNING))
LOG.log(WARNING, e.toString(), e);
}
dbExecutor.execute(() -> {
Settings settings = new Settings();
settings.put(EMOJI_LRU_PREFERENCE, serialized);
try {
settingsManager.mergeSettings(settings, SETTINGS_NAMESPACE);
} catch (DbException e) {
if (LOG.isLoggable(WARNING)) LOG.log(WARNING, e.toString(), e);
}
});
}

9
briar-android/src/main/java/org/thoughtcrime/securesms/components/util/ListenableFutureTask.java
View File

@@ -1,4 +1,4 @@
/**
/*
* Copyright (C) 2014 Open Whisper Systems
*
* This program is free software: you can redistribute it and/or modify
@@ -46,12 +46,7 @@ public class ListenableFutureTask<V> extends FutureTask<V> {
}
private ListenableFutureTask(final V result, @Nullable Object identifier) {
super(new Callable<V>() {
@Override
public V call() throws Exception {
return result;
}
});
super(() -> result);
this.identifier = identifier;
this.run();
}