diff --git a/app/src/main/java/monnethic/mobile/homepage/HomepageActivity.java b/app/src/main/java/monnethic/mobile/homepage/HomepageActivity.java index 27d7763..a7826e6 100644 --- a/app/src/main/java/monnethic/mobile/homepage/HomepageActivity.java +++ b/app/src/main/java/monnethic/mobile/homepage/HomepageActivity.java @@ -1,7 +1,11 @@ package monnethic.mobile.homepage; +import android.Manifest; import android.content.Intent; +import android.content.pm.PackageManager; import android.os.AsyncTask; +import android.support.v4.app.ActivityCompat; +import android.support.v4.content.ContextCompat; import android.support.v7.app.AppCompatActivity; import android.os.Bundle; import android.view.View; @@ -35,11 +39,17 @@ public class HomepageActivity extends AppCompatActivity { } public void launchRegisterActivity(){ + if(ContextCompat.checkSelfPermission(this,Manifest.permission.INTERNET)!=PackageManager.PERMISSION_GRANTED){ + ActivityCompat.requestPermissions(this,new String[]{Manifest.permission.INTERNET},1); + } Intent registerIntent = new Intent(HomepageActivity.this, RegisterActivity.class); HomepageActivity.this.startActivity(registerIntent); } public void launchLoginActivity(){ + if(ContextCompat.checkSelfPermission(this,Manifest.permission.INTERNET)!=PackageManager.PERMISSION_GRANTED){ + ActivityCompat.requestPermissions(this,new String[]{Manifest.permission.INTERNET},1); + } Intent loginIntent = new Intent(HomepageActivity.this, LoginActivity.class); HomepageActivity.this.startActivity(loginIntent); } diff --git a/app/src/main/java/monnethic/mobile/restApi/Config.java b/app/src/main/java/monnethic/mobile/restApi/Config.java index 82c2e27..e42ba06 100644 --- a/app/src/main/java/monnethic/mobile/restApi/Config.java +++ b/app/src/main/java/monnethic/mobile/restApi/Config.java @@ -2,7 +2,8 @@ package monnethic.mobile.restApi; public class Config { //BASE - static private String BASE_URL = "http://10.0.2.2:10053/"; + static private String BASE_URL = "http://37.187.101.44:10053/"; + //static private String BASE_URL = "http://10.0.2.2:10053/"; //static private String BASE_URL = "http://localhost:10053/"; static private String BASE_URL_USER = BASE_URL+"api/rest/user/"; static private String BASE_URL_TRANSACTION = BASE_URL+"api/rest/transaction/";