Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

global: Small cleanups

Browse Source 
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2018-06-25 16:02:30 +02:00
parent 99cf2152c4
commit e1a66d5766
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/wireguard/android/util/SharedLibraryLoader.java
View File

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

2
app/src/main/java/com/wireguard/android/widget/fab/FloatingActionsMenu.java
View File

@ -466,7 +466,7 @@ public class FloatingActionsMenu extends ViewGroup {
} }
@Override @Override
public void setEnabled(boolean enabled) { public void setEnabled(final boolean enabled) {
super.setEnabled(enabled); super.setEnabled(enabled);
mAddButton.setEnabled(enabled); mAddButton.setEnabled(enabled);

7
app/src/main/java/com/wireguard/android/widget/fab/TouchDelegateGroup.java
View File

@ -13,11 +13,11 @@ import android.view.TouchDelegate;
import android.view.View; import android.view.View;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.Collection;
public class TouchDelegateGroup extends TouchDelegate { public class TouchDelegateGroup extends TouchDelegate {
private static final Rect USELESS_HACKY_RECT = new Rect(); 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 TouchDelegate mCurrentTouchDelegate;
private boolean mEnabled; private boolean mEnabled;
@ -49,8 +49,7 @@ public class TouchDelegateGroup extends TouchDelegate {
switch (event.getAction()) { switch (event.getAction()) {
case MotionEvent.ACTION_DOWN: case MotionEvent.ACTION_DOWN:
for (int i = 0; i < mTouchDelegates.size(); i++) { for (final TouchDelegate touchDelegate : mTouchDelegates) {
final TouchDelegate touchDelegate = mTouchDelegates.get(i);
if (touchDelegate.onTouchEvent(event)) { if (touchDelegate.onTouchEvent(event)) {
mCurrentTouchDelegate = touchDelegate; mCurrentTouchDelegate = touchDelegate;
return true; return true;