Small fixes & updates

dkrivoruchko · May 1, 2017 · eacb289 · eacb289
1 parent 23ee051
commit eacb289
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion "25.0.3"
     defaultConfig {
         applicationId "info.dvkr.screenstream"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 21
-        versionName "1.2.5"
+        versionCode 22
+        versionName "1.2.6"
         resConfigs "en", "ru"
     }
 
@@ -35,11 +35,11 @@ android {
 }
 
 dependencies {
-    compile 'com.android.support:design:25.3.0'
-    compile 'com.google.firebase:firebase-crash:10.2.0'
+    compile 'com.android.support:design:25.3.1'
+    compile 'com.google.firebase:firebase-crash:10.2.4'
     compile 'org.greenrobot:eventbus:3.0.0'
 
-    compile 'com.jrummyapps:colorpicker:2.1.6'
+    compile 'com.jrummyapps:colorpicker:2.1.7'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/main/java/info/dvkr/screenstream/ScreenStreamApplication.java b/app/src/main/java/info/dvkr/screenstream/ScreenStreamApplication.java
@@ -5,7 +5,7 @@
 import info.dvkr.screenstream.data.AppData;
 import info.dvkr.screenstream.data.local.PreferencesHelper;
 import info.dvkr.screenstream.service.ForegroundService;
-import info.dvkr.screenstream.viewmodel.MainActivityViewModel;
+import info.dvkr.screenstream.viewModel.MainActivityViewModel;
 
 
 public class ScreenStreamApplication extends Application {

diff --git a/app/src/main/java/info/dvkr/screenstream/data/AppData.java b/app/src/main/java/info/dvkr/screenstream/data/AppData.java
@@ -43,7 +43,7 @@ public final class AppData {
 
     public AppData(final Context context) {
         mWindowManager = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
-        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);
+        mWifiManager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
         mDensityDpi = getDensityDpi();
         mScale = getScale(context);
         mPinRequestHtmlPage = getPinRequestHtmlPage(context);

diff --git a/app/src/main/java/info/dvkr/screenstream/viewModel/MainActivityViewModel.java b/app/src/main/java/info/dvkr/screenstream/viewModel/MainActivityViewModel.java
@@ -1,4 +1,4 @@
-package info.dvkr.screenstream.viewmodel;
+package info.dvkr.screenstream.viewModel;
 
 import android.content.Context;
 import android.databinding.BaseObservable;

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -6,7 +6,7 @@
 
         <variable
             name="viewModel"
-            type="info.dvkr.screenstream.viewmodel.MainActivityViewModel"/>
+            type="info.dvkr.screenstream.viewModel.MainActivityViewModel"/>
     </data>
 
     <LinearLayout

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.3.1'
         classpath 'com.google.gms:google-services:3.0.0'
 
         // NOTE: Do not place your application dependencies here; they belong