diff --git a/app/src/main/java/com/example/cosmosclient/app/Cosmos.java b/app/src/main/java/com/example/cosmosclient/app/Cosmos.java index ab281c2..08f8cc6 100644 --- a/app/src/main/java/com/example/cosmosclient/app/Cosmos.java +++ b/app/src/main/java/com/example/cosmosclient/app/Cosmos.java @@ -4,10 +4,10 @@ import android.app.Activity; import android.app.Application; import android.content.ComponentCallbacks; -import android.content.res.Configuration; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; +import android.content.res.Configuration; import android.os.Build; import android.os.Bundle; import android.support.annotation.RequiresApi; @@ -18,7 +18,7 @@ import com.example.cosmosclient.entities.AreaInformation; import com.example.cosmosclient.entities.Group; import com.example.cosmosclient.services.CosmosBackgroundService; -import com.example.cosmosclient.views.RequestPermissionsActivty; +import com.example.cosmosclient.views.RequestPermissionsActivity; import android.content.SharedPreferences; import android.view.Gravity; @@ -43,15 +43,14 @@ super(); Log.d(TAG, " Constructor"); - registerActivityLifecycleCallbacks(new ActivityLifecycleCallbacks() { @Override public void onActivityCreated(Activity activity, Bundle bundle) { Log.d(TAG, activity + "onActivityCreated"); // 未許可あり - if (activity instanceof RequestPermissionsActivty && !reqPermissions.isEmpty()) { + if (activity instanceof RequestPermissionsActivity && !reqPermissions.isEmpty()) { Log.d(TAG, "isRequestPermission"); - ((RequestPermissionsActivty)activity).setOnRequestPermissionsResultCallback(new ActivityCompat.OnRequestPermissionsResultCallback() { + ((RequestPermissionsActivity)activity).setOnRequestPermissionsResultCallback(new ActivityCompat.OnRequestPermissionsResultCallback() { @Override public void onRequestPermissionsResult(int requestCode, String[] permissions, int[] grantResults) { Log.d(TAG, "onRequestPermissionsResult"); diff --git a/app/src/main/java/com/example/cosmosclient/services/CosmosBackgroundService.java b/app/src/main/java/com/example/cosmosclient/services/CosmosBackgroundService.java index b5939ef..6565442 100644 --- a/app/src/main/java/com/example/cosmosclient/services/CosmosBackgroundService.java +++ b/app/src/main/java/com/example/cosmosclient/services/CosmosBackgroundService.java @@ -64,8 +64,6 @@ private double leftLat,leftLon,rightLat,rightLon; //ここに計算予定 private int count = 0; - - public CosmosBackgroundService() { super("CosmosBackgroundService"); Log.d(TAG, "Constructor"); @@ -251,8 +249,6 @@ updateAreaInformation(location); this.notifications=searchNotifications(cosmos,location); - - } @Override @@ -363,17 +359,17 @@ startActivity(settingsIntent); } - private void updateAreaInformation(Location location){ + private void updateAreaInformation(Location location) { Cosmos app = (Cosmos) getApplication(); count = 0; LOC.setLatitude(location.getLatitude()); LOC.setLongitude(location.getLongitude()); - for(int i = 0;i searchNotifications(Cosmos cosmos, Location location){ double NowLat =location.getLatitude(); diff --git a/app/src/main/java/com/example/cosmosclient/services/CosmosBootReceiver.java b/app/src/main/java/com/example/cosmosclient/services/CosmosBootReceiver.java index f6dd452..75a5283 100644 --- a/app/src/main/java/com/example/cosmosclient/services/CosmosBootReceiver.java +++ b/app/src/main/java/com/example/cosmosclient/services/CosmosBootReceiver.java @@ -12,4 +12,5 @@ public void onReceive(Context context, Intent intent) { Log.d(TAG, "onReceive"); } -} + +} \ No newline at end of file diff --git a/app/src/main/java/com/example/cosmosclient/views/RequestPermissionsActivity.java b/app/src/main/java/com/example/cosmosclient/views/RequestPermissionsActivity.java new file mode 100644 index 0000000..20a29bd --- /dev/null +++ b/app/src/main/java/com/example/cosmosclient/views/RequestPermissionsActivity.java @@ -0,0 +1,20 @@ +package com.example.cosmosclient.views; + +import android.support.annotation.NonNull; +import android.support.v4.app.ActivityCompat; +import android.support.v7.app.AppCompatActivity; + +public class RequestPermissionsActivity extends AppCompatActivity { + private ActivityCompat.OnRequestPermissionsResultCallback listener = null; + + public void setOnRequestPermissionsResultCallback(ActivityCompat.OnRequestPermissionsResultCallback listener) { + this.listener = listener; + } + + // 結果の受け取り + @Override + public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { + listener.onRequestPermissionsResult(requestCode, permissions, grantResults); + } + +} diff --git a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java index 115ff08..1070a00 100644 --- a/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java +++ b/app/src/main/java/com/example/cosmosclient/views/SigninActivity.java @@ -21,7 +21,7 @@ import retrofit2.Retrofit; import retrofit2.converter.jackson.JacksonConverterFactory; -public class SigninActivity extends RequestPermissionsActivty { +public class SigninActivity extends RequestPermissionsActivity { private boolean uIdEnable; private boolean pwEnable; private Button SigninButton; @@ -93,11 +93,11 @@ @Override public void onResponse(Call call, Response response) { if (response.isSuccessful()) { - if(response.body() == null){ + if (response.body() == null){ //パスワードが違う際、アプリが落ちてしまうため Toast.makeText(SigninActivity.this, "パスワードが違います",Toast.LENGTH_LONG).show(); - }else{ + } else { SigninResponse result = response.body(); //app/Cosmosに情報保存 @@ -112,8 +112,7 @@ "ログインしました", Toast.LENGTH_SHORT).show(); finish(); } - - }else{ + } else { //onFailureでキャッチできないエラーの処理 Toast.makeText(SigninActivity.this, "通信エラー",Toast.LENGTH_SHORT).show(); @@ -127,7 +126,6 @@ Toast.makeText(SigninActivity.this, "ユーザIDもしくはパスワードが間違っています",Toast.LENGTH_SHORT).show(); } - }); } }); @@ -179,9 +177,9 @@ } break; case R.id.PasswordText: - if(s.length()>0){ + if (s.length()>0){ pwEnable=true; - }else{ + } else{ pwEnable=false; } break; @@ -194,4 +192,5 @@ } } } + }