Fix bug with server port settings

Author: dkrivoruchko

app/build.gradle

@@ -2,20 +2,18 @@ apply plugin: 'com.android.application'
 
 
 android {
-    signingConfigs {
-
-    }
     compileSdkVersion 24
     buildToolsVersion "24.0.1"
     defaultConfig {
         applicationId "info.dvkr.screenstream"
         minSdkVersion 21
         targetSdkVersion 24
-        versionCode 7
-        versionName "1.1.0"
+        versionCode 8
+        versionName "1.1.1"
 
         resConfigs "en", "ru"
     }
+
     buildTypes {
         release {
             minifyEnabled true
@@ -28,6 +26,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
+    dataBinding {
+        enabled = true
+    }
+
     aaptOptions {
         cruncherEnabled = false
     }
@@ -37,7 +40,6 @@ dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile 'com.android.support:design:24.2.0'
     compile 'com.google.firebase:firebase-crash:9.4.0'
-//    compile "com.androidplot:androidplot-core:0.9.8"
 }
 
 apply plugin: 'com.google.gms.google-services'

app/src/main/java/info/dvkr/screenstream/ForegroundService.java

@@ -240,6 +240,7 @@ private Notification getNotificationStart() {
         final PendingIntent pendingMainActivityIntent = PendingIntent.getActivity(this, 0, mainActivityIntent, 0);
 
         final NotificationCompat.Builder startNotificationBuilder = new NotificationCompat.Builder(this);
+        startNotificationBuilder.setVisibility(NotificationCompat.VISIBILITY_PUBLIC);
         startNotificationBuilder.setSmallIcon(R.drawable.ic_cast_http_24dp);
         startNotificationBuilder.setColor(ContextCompat.getColor(this, R.color.colorPrimaryDark));
         startNotificationBuilder.setContentTitle(getResources().getString(R.string.ready_to_stream));
@@ -256,6 +257,7 @@ private Notification getNotificationStop() {
         final PendingIntent pendingMainActivityIntent = PendingIntent.getActivity(this, 0, mainActivityIntent, 0);
 
         final NotificationCompat.Builder stopNotificationBuilder = new NotificationCompat.Builder(this);
+        stopNotificationBuilder.setVisibility(NotificationCompat.VISIBILITY_PUBLIC);
         stopNotificationBuilder.setSmallIcon(R.drawable.ic_cast_http_24dp);
         stopNotificationBuilder.setColor(ContextCompat.getColor(this, R.color.colorPrimaryDark));
         stopNotificationBuilder.setContentTitle(getResources().getString(R.string.stream));

app/src/main/java/info/dvkr/screenstream/SettingsActivity.java

@@ -54,7 +54,7 @@ public boolean onPreferenceChange(Preference preference, Object data) {
             pinNumberTextPreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
                 @Override
                 public boolean onPreferenceChange(Preference preference, Object data) {
-                    final int pinStringLength = ((String) data).length();
+                    final int pinStringLength = data.toString().length();
                     if (pinStringLength != PIN_DIGITS_COUNT) {
                         Toast.makeText(getActivity().getApplicationContext(), getResources().getString(R.string.pin_digits_count), Toast.LENGTH_LONG).show();
                         return false;
@@ -72,7 +72,12 @@ public boolean onPreferenceChange(Preference preference, Object data) {
             portNumberTextPreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
                 @Override
                 public boolean onPreferenceChange(Preference preference, Object data) {
-                    final int portNumber = Integer.parseInt((String) data);
+                    final String portString = data.toString();
+                    if (portString == null || portString.length() == 0 || portString.length() > 5 || portString.length() < 4) {
+                        Toast.makeText(getActivity().getApplicationContext(), portRange, Toast.LENGTH_LONG).show();
+                        return false;
+                    }
+                    final int portNumber = Integer.parseInt(portString);
                     if ((portNumber < MIN_PORT_NUMBER) || (portNumber > MAX_PORT_NUMBER)) {
                         Toast.makeText(getActivity().getApplicationContext(), portRange, Toast.LENGTH_LONG).show();
                         return false;