diff --git a/app/build.gradle b/app/build.gradle index c4cfb3f..b8d3924 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,7 +19,7 @@ android { buildToolsVersion '25.0.0' defaultConfig { applicationId "us.keithirwin.tracman" - minSdkVersion 14 + minSdkVersion 15 targetSdkVersion 23 versionCode 11 versionName "0.5.0" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c901e7e..254cd9d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,9 +11,9 @@ diff --git a/app/src/main/java/us/keithirwin/tracman/LoginActivity.java b/app/src/main/java/us/keithirwin/tracman/LoginActivity.java index 55b7838..e1995a8 100644 --- a/app/src/main/java/us/keithirwin/tracman/LoginActivity.java +++ b/app/src/main/java/us/keithirwin/tracman/LoginActivity.java @@ -151,13 +151,13 @@ public class LoginActivity extends AppCompatActivity implements .build(); Request request = new Request.Builder() - .url(SERVER_ADDRESS+"login/android/google/idtoken?id_token="+token) + .url(SERVER_ADDRESS+"login/app/google?id_token="+token) .build(); client.newCall(request).enqueue(new Callback() { @Override public void onFailure(Call call, IOException e) { - Log.e(TAG, "Failed to connect to server: " + SERVER_ADDRESS + "login/android/google/idtoken?id_token=" + token); + Log.e(TAG, "Failed to connect to server: " + SERVER_ADDRESS + "login/app/google?id_token=" + token); showError(R.string.server_connection_error); e.printStackTrace(); } diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index a767e2d..bc75670 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -66,22 +66,22 @@ + android:layout_height="match_parent" /> + + android:layout_height="match_parent" /> + + android:layout_height="match_parent" /> + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0bf832f..72ae05d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -98,7 +98,7 @@ Bug report - Forgot your password? + Forgot your password? Login email password