Version 6.2

app/build.gradle

@@ -8,8 +8,8 @@ android {
         minSdkVersion 16
         targetSdkVersion 28
 
-        versionName "6.1.1"
-        versionCode = 183
+        versionName "6.2"
+        versionCode = 186
     }
 
     flavorDimensions "root"

app/src/main/java/com/limelight/AppView.java

@@ -1,5 +1,6 @@
 package com.limelight;
 
+import java.io.IOException;
 import java.io.StringReader;
 import java.util.List;
 
@@ -43,6 +44,8 @@ import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 
+import org.xmlpull.v1.XmlPullParserException;
+
 public class AppView extends Activity implements AdapterFragmentCallbacks {
     private AppGridAdapter appGridAdapter;
     private String uuidString;
@@ -214,7 +217,9 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
                         blockingLoadSpinner.dismiss();
                         blockingLoadSpinner = null;
                     }
-                } catch (Exception ignored) {}
+                } catch (XmlPullParserException | IOException e) {
+                    e.printStackTrace();
+                }
             }
         });
 
@@ -278,7 +283,7 @@ public class AppView extends Activity implements AdapterFragmentCallbacks {
             List<NvApp> applist = NvHTTP.getAppListByReader(new StringReader(lastRawApplist));
             updateUiWithAppList(applist);
             LimeLog.info("Loaded applist from cache");
-        } catch (Exception e) {
+        } catch (IOException | XmlPullParserException e) {
             if (lastRawApplist != null) {
                 LimeLog.warning("Saved applist corrupted: "+lastRawApplist);
                 e.printStackTrace();

app/src/main/java/com/limelight/Game.java

@@ -908,7 +908,12 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                 return false;
             }
 
-            conn.sendKeyboardInput(translated, KeyboardPacket.KEY_DOWN, getModifierState(event));
+            byte modifiers = getModifierState(event);
+            if (KeyboardTranslator.needsShift(event.getKeyCode())) {
+                modifiers |= KeyboardPacket.MODIFIER_SHIFT;
+                conn.sendKeyboardInput((short) 0x8010, KeyboardPacket.KEY_DOWN, modifiers);
+            }
+            conn.sendKeyboardInput(translated, KeyboardPacket.KEY_DOWN, modifiers);
         }
 
         return true;
@@ -959,7 +964,14 @@ public class Game extends Activity implements SurfaceHolder.Callback,
                 return false;
             }
 
-            conn.sendKeyboardInput(translated, KeyboardPacket.KEY_UP, getModifierState(event));
+            byte modifiers = getModifierState(event);
+            if (KeyboardTranslator.needsShift(event.getKeyCode())) {
+                modifiers |= KeyboardPacket.MODIFIER_SHIFT;
+            }
+            conn.sendKeyboardInput(translated, KeyboardPacket.KEY_UP, modifiers);
+            if (KeyboardTranslator.needsShift(event.getKeyCode())) {
+                conn.sendKeyboardInput((short) 0x8010, KeyboardPacket.KEY_UP, getModifierState(event));
+            }
         }
 
         return true;

app/src/main/java/com/limelight/PcView.java

@@ -53,6 +53,8 @@ import android.widget.RelativeLayout;
 import android.widget.Toast;
 import android.widget.AdapterView.AdapterContextMenuInfo;
 
+import org.xmlpull.v1.XmlPullParserException;
+
 import javax.microedition.khronos.egl.EGLConfig;
 import javax.microedition.khronos.opengles.GL10;
 
@@ -420,7 +422,7 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                     message = getResources().getString(R.string.error_unknown_host);
                 } catch (FileNotFoundException e) {
                     message = getResources().getString(R.string.error_404);
-                } catch (Exception e) {
+                } catch (XmlPullParserException | IOException e) {
                     e.printStackTrace();
                     message = e.getMessage();
                 }
@@ -521,8 +523,9 @@ public class PcView extends Activity implements AdapterFragmentCallbacks {
                     message = getResources().getString(R.string.error_unknown_host);
                 } catch (FileNotFoundException e) {
                     message = getResources().getString(R.string.error_404);
-                } catch (Exception e) {
+                } catch (XmlPullParserException | IOException e) {
                     message = e.getMessage();
+                    e.printStackTrace();
                 }
 
                 final String toastMessage = message;

app/src/main/java/com/limelight/ShortcutTrampoline.java

@@ -200,6 +200,14 @@ public class ShortcutTrampoline extends Activity {
 
     protected boolean validateInput() {
         // Validate UUID
+        if (uuidString == null) {
+            Dialog.displayDialog(ShortcutTrampoline.this,
+                    getResources().getString(R.string.conn_error_title),
+                    getResources().getString(R.string.scut_invalid_uuid),
+                    true);
+            return false;
+        }
+
         try {
             UUID.fromString(uuidString);
         } catch (IllegalArgumentException ex) {

app/src/main/java/com/limelight/binding/crypto/AndroidCryptoProvider.java

@@ -154,7 +154,7 @@ public class AndroidCryptoProvider implements LimelightCryptoProvider {
         } catch (Exception e) {
             // Nothing should go wrong here
             e.printStackTrace();
-            return false;
+            throw new RuntimeException(e);
         }
 
         LimeLog.info("Generated a new key pair");

app/src/main/java/com/limelight/binding/input/KeyboardTranslator.java

@@ -47,7 +47,21 @@ public class KeyboardTranslator {
 	public static final int VK_BACK_QUOTE = 192;
 	public static final int VK_QUOTE = 222;
 	public static final int VK_PAUSE = 19;
-	
+
+	public static boolean needsShift(int keycode) {
+		switch (keycode)
+		{
+			case KeyEvent.KEYCODE_AT:
+			case KeyEvent.KEYCODE_POUND:
+			case KeyEvent.KEYCODE_PLUS:
+			case KeyEvent.KEYCODE_STAR:
+				return true;
+
+			default:
+				return false;
+		}
+	}
+
 	/**
 	 * Translates the given keycode and returns the GFE keycode
 	 * @param keycode the code to be translated
@@ -116,7 +130,8 @@ public class KeyboardTranslator {
 			case KeyEvent.KEYCODE_ENTER:
 				translated = 0x0d;
 				break;
-				
+
+			case KeyEvent.KEYCODE_PLUS:
 			case KeyEvent.KEYCODE_EQUALS:
 				translated = 0xbb;
 				break;
@@ -257,7 +272,19 @@ public class KeyboardTranslator {
 			case KeyEvent.KEYCODE_NUMPAD_DOT:
 				translated = 0x6E;
 				break;
-				
+
+			case KeyEvent.KEYCODE_AT:
+				translated = 2 + VK_0;
+				break;
+
+			case KeyEvent.KEYCODE_POUND:
+				translated = 3 + VK_0;
+				break;
+
+			case KeyEvent.KEYCODE_STAR:
+				translated = 8 + VK_0;
+				break;
+
 			default:
 				System.out.println("No key for "+keycode);
 				return 0;

app/src/main/java/com/limelight/binding/input/driver/Xbox360Controller.java

@@ -14,6 +14,7 @@ public class Xbox360Controller extends AbstractXboxController {
     private static final int XB360_IFACE_PROTOCOL = 1; // Wired only
 
     private static final int[] SUPPORTED_VENDORS = {
+            0x0079, // GPD Win 2
             0x044f, // Thrustmaster
             0x045e, // Microsoft
             0x046d, // Logitech
@@ -23,6 +24,7 @@ public class Xbox360Controller extends AbstractXboxController {
             0x07ff, // Mad Catz
             0x0e6f, // Unknown
             0x0f0d, // Hori
+            0x1038, // SteelSeries
             0x11c9, // Nacon
             0x12ab, // Unknown
             0x1430, // RedOctane

app/src/main/java/com/limelight/binding/input/driver/XboxOneController.java

@@ -8,6 +8,7 @@ import com.limelight.LimeLog;
 import com.limelight.nvstream.input.ControllerPacket;
 
 import java.nio.ByteBuffer;
+import java.util.Arrays;
 
 public class XboxOneController extends AbstractXboxController {
 
@@ -23,8 +24,30 @@ public class XboxOneController extends AbstractXboxController {
             0x24c6, // PowerA
     };
 
-    // FIXME: odata_serial
-    private static final byte[] XB1_INIT_DATA = {0x05, 0x20, 0x00, 0x01, 0x00};
+    private static final byte[] FW2015_INIT = {0x05, 0x20, 0x00, 0x01, 0x00};
+    private static final byte[] HORI_INIT = {0x01, 0x20, 0x00, 0x09, 0x00, 0x04, 0x20, 0x3a,
+            0x00, 0x00, 0x00, (byte)0x80, 0x00};
+    private static final byte[] PDP_INIT1 = {0x0a, 0x20, 0x00, 0x03, 0x00, 0x01, 0x14};
+    private static final byte[] PDP_INIT2 = {0x06, 0x20, 0x00, 0x02, 0x01, 0x00};
+    private static final byte[] RUMBLE_INIT1 = {0x09, 0x00, 0x00, 0x09, 0x00, 0x0F, 0x00, 0x00,
+            0x1D, 0x1D, (byte)0xFF, 0x00, 0x00};
+    private static final byte[] RUMBLE_INIT2 = {0x09, 0x00, 0x00, 0x09, 0x00, 0x0F, 0x00, 0x00,
+            0x00, 0x00, 0x00, 0x00, 0x00};
+
+    private static InitPacket[] INIT_PKTS = {
+            new InitPacket(0x0e6f, 0x0165, HORI_INIT),
+            new InitPacket(0x0f0d, 0x0067, HORI_INIT),
+            new InitPacket(0x0000, 0x0000, FW2015_INIT),
+            new InitPacket(0x0e6f, 0x0000, PDP_INIT1),
+            new InitPacket(0x0e6f, 0x0000, PDP_INIT2),
+            new InitPacket(0x24c6, 0x541a, RUMBLE_INIT1),
+            new InitPacket(0x24c6, 0x542a, RUMBLE_INIT1),
+            new InitPacket(0x24c6, 0x543a, RUMBLE_INIT1),
+            new InitPacket(0x24c6, 0x541a, RUMBLE_INIT2),
+            new InitPacket(0x24c6, 0x542a, RUMBLE_INIT2),
+            new InitPacket(0x24c6, 0x543a, RUMBLE_INIT2),
+    };
+
 
     public XboxOneController(UsbDevice device, UsbDeviceConnection connection, int deviceId, UsbDriverListener listener) {
         super(device, connection, deviceId, listener);
@@ -111,13 +134,43 @@ public class XboxOneController extends AbstractXboxController {
 
     @Override
     protected boolean doInit() {
-        // Send the initialization packet
-        int res = connection.bulkTransfer(outEndpt, XB1_INIT_DATA, XB1_INIT_DATA.length, 3000);
-        if (res != XB1_INIT_DATA.length) {
-            LimeLog.warning("Initialization transfer failed: "+res);
-            return false;
+        byte seqNum = 0;
+
+        // Send all applicable init packets
+        for (InitPacket pkt : INIT_PKTS) {
+            if (pkt.vendorId != 0 && device.getVendorId() != pkt.vendorId) {
+                continue;
+            }
+
+            if (pkt.productId != 0 && device.getProductId() != pkt.productId) {
+                continue;
+            }
+
+            byte[] data = Arrays.copyOf(pkt.data, pkt.data.length);
+
+            // Populate sequence number
+            data[2] = seqNum++;
+
+            // Send the initialization packet
+            int res = connection.bulkTransfer(outEndpt, data, data.length, 3000);
+            if (res != data.length) {
+                LimeLog.warning("Initialization transfer failed: "+res);
+                return false;
+            }
         }
 
         return true;
     }
+
+    private static class InitPacket {
+        final int vendorId;
+        final int productId;
+        final byte[] data;
+
+        InitPacket(int vendorId, int productId, byte[] data) {
+            this.vendorId = vendorId;
+            this.productId = productId;
+            this.data = data;
+        }
+    }
 }

app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualController.java

@@ -167,26 +167,22 @@ public class VirtualController {
     }
 
     void sendControllerInputContext() {
-        try {
-            _DBG("INPUT_MAP + " + inputContext.inputMap);
-            _DBG("LEFT_TRIGGER " + inputContext.leftTrigger);
-            _DBG("RIGHT_TRIGGER " + inputContext.rightTrigger);
-            _DBG("LEFT STICK X: " + inputContext.leftStickX + " Y: " + inputContext.leftStickY);
-            _DBG("RIGHT STICK X: " + inputContext.rightStickX + " Y: " + inputContext.rightStickY);
+        _DBG("INPUT_MAP + " + inputContext.inputMap);
+        _DBG("LEFT_TRIGGER " + inputContext.leftTrigger);
+        _DBG("RIGHT_TRIGGER " + inputContext.rightTrigger);
+        _DBG("LEFT STICK X: " + inputContext.leftStickX + " Y: " + inputContext.leftStickY);
+        _DBG("RIGHT STICK X: " + inputContext.rightStickX + " Y: " + inputContext.rightStickY);
 
-            if (connection != null) {
-                connection.sendControllerInput(
-                        inputContext.inputMap,
-                        inputContext.leftTrigger,
-                        inputContext.rightTrigger,
-                        inputContext.leftStickX,
-                        inputContext.leftStickY,
-                        inputContext.rightStickX,
-                        inputContext.rightStickY
-                );
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
+        if (connection != null) {
+            connection.sendControllerInput(
+                    inputContext.inputMap,
+                    inputContext.leftTrigger,
+                    inputContext.rightTrigger,
+                    inputContext.leftStickX,
+                    inputContext.leftStickY,
+                    inputContext.rightStickX,
+                    inputContext.rightStickY
+            );
         }
     }
 }

app/src/main/java/com/limelight/binding/input/virtual_controller/VirtualControllerElement.java

@@ -166,58 +166,54 @@ public abstract class VirtualControllerElement extends View {
     }
 
     protected void showConfigurationDialog() {
-        try {
-            AlertDialog.Builder alertBuilder = new AlertDialog.Builder(getContext());
+        AlertDialog.Builder alertBuilder = new AlertDialog.Builder(getContext());
 
-            alertBuilder.setTitle("Configuration");
+        alertBuilder.setTitle("Configuration");
 
-            CharSequence functions[] = new CharSequence[]{
-                    "Move",
-                    "Resize",
-                /*election
-                "Set n
-                Disable color sormal color",
-                "Set pressed color",
+        CharSequence functions[] = new CharSequence[]{
+                "Move",
+                "Resize",
+            /*election
+            "Set n
+            Disable color sormal color",
+            "Set pressed color",
+            */
+                "Cancel"
+        };
+
+        alertBuilder.setItems(functions, new DialogInterface.OnClickListener() {
+
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                switch (which) {
+                    case 0: { // move
+                        actionEnableMove();
+                        break;
+                    }
+                    case 1: { // resize
+                        actionEnableResize();
+                        break;
+                    }
+                /*
+                case 2:	{ // set default color
+                    actionShowNormalColorChooser();
+                    break;
+                }
+                case 3:	{ // set pressed color
+                    actionShowPressedColorChooser();
+                    break;
+                }
                 */
-                    "Cancel"
-            };
-
-            alertBuilder.setItems(functions, new DialogInterface.OnClickListener() {
-
-                @Override
-                public void onClick(DialogInterface dialog, int which) {
-                    switch (which) {
-                        case 0: { // move
-                            actionEnableMove();
-                            break;
-                        }
-                        case 1: { // resize
-                            actionEnableResize();
-                            break;
-                        }
-                    /*
-                    case 2:	{ // set default color
-                        actionShowNormalColorChooser();
+                    default: { // cancel
+                        actionCancel();
                         break;
                     }
-                    case 3:	{ // set pressed color
-                        actionShowPressedColorChooser();
-                        break;
-                    }
-                    */
-                        default: { // cancel
-                            actionCancel();
-                            break;
-                        }
-                    }
                 }
-            });
-            AlertDialog alert = alertBuilder.create();
-            // show menu
-            alert.show();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+            }
+        });
+        AlertDialog alert = alertBuilder.create();
+        // show menu
+        alert.show();
     }
 
     @Override

app/src/main/java/com/limelight/computers/ComputerManagerService.java

@@ -360,13 +360,14 @@ public class ComputerManagerService extends Service {
             // Since we're on the same network, we can use STUN to find
             // our WAN address, which is also very likely the WAN address
             // of the PC. We can use this later to connect remotely.
-            fakeDetails.remoteAddress = NvConnection.findExternalAddressForMdns();
+            fakeDetails.remoteAddress = NvConnection.findExternalAddressForMdns("stun.moonlight-stream.org", 3478);
         }
 
         // Block while we try to fill the details
         try {
-            runPoll(fakeDetails, true, 0);
-            if (fakeDetails.state == ComputerDetails.State.ONLINE) {
+            // We cannot use runPoll() here because it will attempt to persist the state of the machine
+            // in the database, which would be bad because we don't have our pinned cert loaded yet.
+            if (pollComputer(fakeDetails)) {
                 // See if we have record of this PC to pull its pinned cert
                 synchronized (pollingTuples) {
                     for (PollingTuple tuple : pollingTuples) {
@@ -377,10 +378,9 @@ public class ComputerManagerService extends Service {
                     }
                 }
 
-                if (fakeDetails.serverCert != null) {
-                    // Poll again with the pinned cert to get accurate pairing information
-                    runPoll(fakeDetails, true, 0);
-                }
+                // Poll again, possibly with the pinned cert, to get accurate pairing information.
+                // This will insert the host into the database too.
+                runPoll(fakeDetails, true, 0);
             }
         } catch (InterruptedException e) {
             return false;
@@ -457,8 +457,12 @@ public class ComputerManagerService extends Service {
             ComputerDetails newDetails = http.getComputerDetails();
 
             // Check if this is the PC we expected
-            if (details.uuid != null && newDetails.uuid != null &&
-                    !details.uuid.equals(newDetails.uuid)) {
+            if (newDetails.uuid == null) {
+                LimeLog.severe("Polling returned no UUID!");
+                return null;
+            }
+            // details.uuid can be null on initial PC add
+            else if (details.uuid != null && !details.uuid.equals(newDetails.uuid)) {
                 // We got the wrong PC!
                 LimeLog.info("Polling returned the wrong PC!");
                 return null;
@@ -468,7 +472,7 @@ public class ComputerManagerService extends Service {
             newDetails.activeAddress = address;
 
             return newDetails;
-        } catch (Exception e) {
+        } catch (XmlPullParserException | IOException e) {
             e.printStackTrace();
             return null;
         }

app/src/main/java/com/limelight/grid/PcGridAdapter.java

@@ -9,6 +9,7 @@ import android.widget.TextView;
 import com.limelight.PcView;
 import com.limelight.R;
 import com.limelight.nvstream.http.ComputerDetails;
+import com.limelight.nvstream.http.PairingManager;
 
 import java.util.Collections;
 import java.util.Comparator;
@@ -77,6 +78,14 @@ public class PcGridAdapter extends GenericGridAdapter<PcView.ComputerObject> {
             overlayView.setAlpha(0.4f);
             return true;
         }
+        // We must check if the status is exactly online and unpaired
+        // to avoid colliding with the loading spinner when status is unknown
+        else if (obj.details.state == ComputerDetails.State.ONLINE &&
+                obj.details.pairState == PairingManager.PairState.NOT_PAIRED) {
+            overlayView.setImageResource(R.drawable.ic_lock);
+            overlayView.setAlpha(1.0f);
+            return true;
+        }
         return false;
     }
 }

app/src/main/java/com/limelight/preferences/AddComputerManually.java

@@ -91,14 +91,20 @@ public class AddComputerManually extends Activity {
     }
 
     private void doAddPc(String host) {
-        String msg;
         boolean wrongSiteLocal = false;
         boolean success;
 
         SpinnerDialog dialog = SpinnerDialog.displayDialog(this, getResources().getString(R.string.title_add_pc),
             getResources().getString(R.string.msg_add_pc), false);
 
-        success = managerBinder.addComputerBlocking(host, true);
+        try {
+            success = managerBinder.addComputerBlocking(host, true);
+        } catch (IllegalArgumentException e) {
+            // This can be thrown from OkHttp if the host fails to canonicalize to a valid name.
+            // https://github.com/square/okhttp/blob/okhttp_27/okhttp/src/main/java/com/squareup/okhttp/HttpUrl.java#L705
+            e.printStackTrace();
+            success = false;
+        }
         if (!success){
             wrongSiteLocal = isWrongSubnetSiteLocalAddress(host);
         }

app/src/main/java/com/limelight/preferences/PreferenceConfiguration.java

@@ -84,6 +84,9 @@ public class PreferenceConfiguration {
         if (resString.equalsIgnoreCase("360p")) {
             return 360;
         }
+        else if (resString.equalsIgnoreCase("480p")) {
+            return 480;
+        }
         else if (resString.equalsIgnoreCase("720p")) {
             return 720;
         }
@@ -103,13 +106,22 @@ public class PreferenceConfiguration {
     }
 
     private static int getWidthFromResolutionString(String resString) {
-        return (getHeightFromResolutionString(resString) * 16) / 9;
+        int height = getHeightFromResolutionString(resString);
+        if (height == 480) {
+            // This isn't an exact 16:9 resolution
+            return 854;
+        }
+        else {
+            return (height * 16) / 9;
+        }
     }
 
     private static String getResolutionString(int width, int height) {
         switch (height) {
             case 360:
                 return "360p";
+            case 480:
+                return "480p";
             default:
             case 720:
                 return "720p";
@@ -139,6 +151,9 @@ public class PreferenceConfiguration {
         if (width * height <= 640 * 360) {
             return (int)(1000 * (fps / 30.0));
         }
+        else if (width * height <= 854 * 480) {
+            return (int)(1500 * (fps / 30.0));
+        }
         // This covers 1280x720 and 1280x800 too
         else if (width * height <= 1366 * 768) {
             return (int)(5000 * (fps / 30.0));

app/src/main/java/com/limelight/utils/ServerHelper.java

@@ -13,7 +13,10 @@ import com.limelight.nvstream.http.GfeHttpResponseException;
 import com.limelight.nvstream.http.NvApp;
 import com.limelight.nvstream.http.NvHTTP;
 
+import org.xmlpull.v1.XmlPullParserException;
+
 import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.net.UnknownHostException;
 import java.security.cert.CertificateEncodingException;
 
@@ -84,8 +87,9 @@ public class ServerHelper {
                     message = parent.getResources().getString(R.string.error_unknown_host);
                 } catch (FileNotFoundException e) {
                     message = parent.getResources().getString(R.string.error_404);
-                } catch (Exception e) {
+                } catch (IOException | XmlPullParserException e) {
                     message = e.getMessage();
+                    e.printStackTrace();
                 } finally {
                     if (onComplete != null) {
                         onComplete.run();

app/src/main/res/drawable/ic_lock.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
+</vector>

app/src/main/res/values/arrays.xml

@@ -2,6 +2,7 @@
 <resources>
     <string-array name="resolution_names">
         <item>360p</item>
+        <item>480p</item>
         <item>720p</item>
         <item>1080p</item>
         <item>1440p</item>
@@ -9,6 +10,7 @@
     </string-array>
     <string-array name="resolution_values" translatable="false">
         <item>360p</item>
+        <item>480p</item>
         <item>720p</item>
         <item>1080p</item>
         <item>1440p</item>

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.1'
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue May 08 18:56:31 PDT 2018
+#Tue Feb 05 20:54:22 PST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip