ki9
/
tracman-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#7 Started to work on new auth

master
Keith Irwin 2017-04-19 08:43:51 -04:00
parent 15d0c2d03b
commit 189232eed1
No known key found for this signature in database
GPG Key ID: 378933C743E2BBC0
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@ -19,7 +19,7 @@ android {
buildToolsVersion '25.0.0' buildToolsVersion '25.0.0'
defaultConfig { defaultConfig {
applicationId "us.keithirwin.tracman" applicationId "us.keithirwin.tracman"
minSdkVersion 14 minSdkVersion 15
targetSdkVersion 23 targetSdkVersion 23
versionCode 11 versionCode 11
versionName "0.5.0" versionName "0.5.0"

2
app/src/main/AndroidManifest.xml
View File

@ -11,9 +11,9 @@
<uses-feature android:name="android.hardware.location.gps" /> <uses-feature android:name="android.hardware.location.gps" />
<application <application
android:label="@string/app_name"
android:allowBackup="true" android:allowBackup="true"
android:icon="@drawable/logo_by" android:icon="@drawable/logo_by"
android:label="@string/app_name"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">

4
app/src/main/java/us/keithirwin/tracman/LoginActivity.java
View File

@ -151,13 +151,13 @@ public class LoginActivity extends AppCompatActivity implements
.build(); .build();
Request request = new Request.Builder() 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(); .build();
client.newCall(request).enqueue(new Callback() { client.newCall(request).enqueue(new Callback() {
@Override @Override
public void onFailure(Call call, IOException e) { 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); showError(R.string.server_connection_error);
e.printStackTrace(); e.printStackTrace();
} }

12
app/src/main/res/layout/activity_login.xml
View File

@ -66,22 +66,22 @@
<ImageButton <ImageButton
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:layout_height="match_parent" android:layout_height="match_parent" />
android:src="@drawable/social_google" /> <!--android:src="@drawable/social_google" />-->
<!-- Facebook --> <!-- Facebook -->
<ImageButton <ImageButton
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:layout_height="match_parent" android:layout_height="match_parent" />
android:src="@drawable/social_facebook" /> <!--android:src="@drawable/social_facebook" />-->
<!-- Twitter --> <!-- Twitter -->
<ImageButton <ImageButton
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:layout_height="match_parent" android:layout_height="match_parent" />
android:src="@drawable/social_twitter" /> <!--android:src="@drawable/social_twitter" />-->
</LinearLayout> </LinearLayout>

2
app/src/main/res/values/strings.xml
View File

@ -98,7 +98,7 @@
<!--Strings related to bugs--> <!--Strings related to bugs-->
<string name="bugs_name">Bug report</string> <string name="bugs_name">Bug report</string>
<string name="login_forgot_password"><a href="https://tracman.org/login/forgot">Forgot your password?</a> <string name="login_forgot_password"><a href="https://tracman.org/login/forgot">Forgot your password?</a></string>
<string name="login_button_text">Login</string> <string name="login_button_text">Login</string>
<string name="email">email</string> <string name="email">email</string>
<string name="password">password</string> <string name="password">password</string>