Monnethic/app-mobile
0
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

up

Browse source
This commit is contained in:
GME 2019-04-16 18:48:06 +02:00
parent 501c077880
commit bbdea83fe9
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/monnethic/mobile/homepage/HomepageActivity.java
View file

@ -1,7 +1,11 @@
package monnethic.mobile.homepage; package monnethic.mobile.homepage;
import android.Manifest;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.os.Bundle; import android.os.Bundle;
import android.view.View; import android.view.View;
@ -35,11 +39,17 @@ public class HomepageActivity extends AppCompatActivity {
} }
public void launchRegisterActivity(){ 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); Intent registerIntent = new Intent(HomepageActivity.this, RegisterActivity.class);
HomepageActivity.this.startActivity(registerIntent); HomepageActivity.this.startActivity(registerIntent);
} }
public void launchLoginActivity(){ 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); Intent loginIntent = new Intent(HomepageActivity.this, LoginActivity.class);
HomepageActivity.this.startActivity(loginIntent); HomepageActivity.this.startActivity(loginIntent);
} }

3
app/src/main/java/monnethic/mobile/restApi/Config.java
View file

@ -2,7 +2,8 @@ package monnethic.mobile.restApi;
public class Config { public class Config {
//BASE //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 = "http://localhost:10053/";
static private String BASE_URL_USER = BASE_URL+"api/rest/user/"; static private String BASE_URL_USER = BASE_URL+"api/rest/user/";
static private String BASE_URL_TRANSACTION = BASE_URL+"api/rest/transaction/"; static private String BASE_URL_TRANSACTION = BASE_URL+"api/rest/transaction/";