mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-11-04 00:33:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Use Timber for logging

Browse source
This commit is contained in:
veyndan 2017-04-17 16:24:50 +01:00
parent 052d0c9c8e
commit d33935c70f
35 changed files with 238 additions and 259 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
View file

@ -14,9 +14,7 @@ import android.os.Bundle;
import android.support.v4.app.NavUtils;
import android.text.Editable;
import android.text.TextWatcher;
import android.util.Log;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.inputmethod.EditorInfo;
@ -26,7 +24,6 @@ import android.widget.TextView;
import android.widget.Toast;
import java.io.IOException;
import java.util.Locale;
import fr.free.nrw.commons.CommonsApplication;
import fr.free.nrw.commons.EventLog;
@ -36,6 +33,7 @@ import fr.free.nrw.commons.WelcomeActivity;
import fr.free.nrw.commons.contributions.ContributionsActivity;
import fr.free.nrw.commons.contributions.ContributionsContentProvider;
import fr.free.nrw.commons.modifications.ModificationsContentProvider;
import timber.log.Timber;
public class LoginActivity extends AccountAuthenticatorActivity {
@ -61,7 +59,7 @@ public class LoginActivity extends AccountAuthenticatorActivity {
@Override
protected void onPostExecute(String result) {
super.onPostExecute(result);
Log.d("Commons", "Login done!");
Timber.d("Login done!");
EventLog.schema(CommonsApplication.EVENT_LOGIN_ATTEMPT)
.param("username", username)
@ -80,7 +78,7 @@ public class LoginActivity extends AccountAuthenticatorActivity {
Bundle extras = context.getIntent().getExtras();
if (extras != null) {
Log.d("LoginActivity", "Bundle of extras: " + extras.toString());
Timber.d("Bundle of extras: %s", extras);
if (accountCreated) { // Pass the new account back to the account manager
AccountAuthenticatorResponse response = extras.getParcelable(AccountManager.KEY_ACCOUNT_AUTHENTICATOR_RESPONSE);
Bundle authResult = new Bundle();
@ -116,7 +114,7 @@ public class LoginActivity extends AccountAuthenticatorActivity {
response = R.string.login_failed_blocked;
} else {
// Should never really happen
Log.d("Commons", "Login failed with reason: " + result);
Timber.d("Login failed with reason: %s", result);
response = R.string.login_failed_generic;
}
Toast.makeText(getApplicationContext(), response, Toast.LENGTH_LONG).show();
@ -242,7 +240,7 @@ public class LoginActivity extends AccountAuthenticatorActivity {
String password = passwordEdit.getText().toString();
Log.d("Commons", "Login to start!");
Timber.d("Login to start!");
LoginTask task = new LoginTask(this);
task.execute(canonicalUsername, password);
}

8
app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java
View file

@ -2,13 +2,13 @@ package fr.free.nrw.commons.auth;
import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.webkit.WebSettings;
import android.webkit.WebView;
import android.webkit.WebViewClient;
import android.widget.Toast;
import fr.free.nrw.commons.theme.BaseActivity;
import timber.log.Timber;
public class SignupActivity extends BaseActivity {
@ -17,7 +17,7 @@ public class SignupActivity extends BaseActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Log.d("SignupActivity", "Signup Activity started");
Timber.d("Signup Activity started");
getSupportActionBar().hide();
@ -37,7 +37,7 @@ public class SignupActivity extends BaseActivity {
public boolean shouldOverrideUrlLoading(WebView view, String url) {
if (url.equals("https://commons.m.wikimedia.org/w/index.php?title=Main_Page&welcome=yes")) {
//Signup success, so clear cookies, notify user, and load LoginActivity again
Log.d("SignupActivity", "Overriding URL" + url);
Timber.d("Overriding URL %s", url);
Toast toast = Toast.makeText(getApplicationContext(), "Account created!", Toast.LENGTH_LONG);
toast.show();
@ -47,7 +47,7 @@ public class SignupActivity extends BaseActivity {
return true;
} else {
//If user clicks any other links in the webview
Log.d("SignupActivity", "Not overriding URL, URL is: " + url);
Timber.d("Not overriding URL, URL is: %s", url);
return false;
}
}