Kaynağa Gözat

global: Small cleanups

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
master
Jason A. Donenfeld 6 yıl önce
ebeveyn
işleme
e1a66d5766
3 değiştirilmiş dosya ile 6 ekleme ve 7 silme
  1. +2
    -2
      app/src/main/java/com/wireguard/android/util/SharedLibraryLoader.java
  2. +1
    -1
      app/src/main/java/com/wireguard/android/widget/fab/FloatingActionsMenu.java
  3. +3
    -4
      app/src/main/java/com/wireguard/android/widget/fab/TouchDelegateGroup.java

+ 2
- 2
app/src/main/java/com/wireguard/android/util/SharedLibraryLoader.java Dosyayı Görüntüle

@@ -27,7 +27,7 @@ public final class SharedLibraryLoader {
try {
System.loadLibrary(libName);
return;
} catch (UnsatisfiedLinkError e) {
} catch (final UnsatisfiedLinkError e) {
Log.d(TAG, "Failed to load library normally, so attempting to extract from apk", e);
noAbiException = e;
}
@@ -59,7 +59,7 @@ public final class SharedLibraryLoader {
}
System.load(f.getAbsolutePath());
return;
} catch (Exception e) {
} catch (final Exception e) {
Log.d(TAG, "Failed to load library apk:/" + libZipPath, e);
noAbiException = e;
} finally {


+ 1
- 1
app/src/main/java/com/wireguard/android/widget/fab/FloatingActionsMenu.java Dosyayı Görüntüle

@@ -466,7 +466,7 @@ public class FloatingActionsMenu extends ViewGroup {
}

@Override
public void setEnabled(boolean enabled) {
public void setEnabled(final boolean enabled) {
super.setEnabled(enabled);

mAddButton.setEnabled(enabled);


+ 3
- 4
app/src/main/java/com/wireguard/android/widget/fab/TouchDelegateGroup.java Dosyayı Görüntüle

@@ -13,11 +13,11 @@ import android.view.TouchDelegate;
import android.view.View;

import java.util.ArrayList;
import java.util.List;
import java.util.Collection;

public class TouchDelegateGroup extends TouchDelegate {
private static final Rect USELESS_HACKY_RECT = new Rect();
private final List<TouchDelegate> mTouchDelegates = new ArrayList<>();
private final Collection<TouchDelegate> mTouchDelegates = new ArrayList<>();
private TouchDelegate mCurrentTouchDelegate;
private boolean mEnabled;

@@ -49,8 +49,7 @@ public class TouchDelegateGroup extends TouchDelegate {

switch (event.getAction()) {
case MotionEvent.ACTION_DOWN:
for (int i = 0; i < mTouchDelegates.size(); i++) {
final TouchDelegate touchDelegate = mTouchDelegates.get(i);
for (final TouchDelegate touchDelegate : mTouchDelegates) {
if (touchDelegate.onTouchEvent(event)) {
mCurrentTouchDelegate = touchDelegate;
return true;


Yükleniyor…
İptal
Kaydet