From e30c08495bd962503ceedc6b8060bd5ea87101e3 Mon Sep 17 00:00:00 2001 From: misaochan Date: Thu, 30 Jun 2016 17:05:11 +1200 Subject: [PATCH 1/2] Remove redundant whitespace in ContributionsActivity --- .../nrw/commons/contributions/ContributionsActivity.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/commons/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java b/commons/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java index 2d42aca33..30b4ecf59 100644 --- a/commons/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java +++ b/commons/app/src/main/java/fr/free/nrw/commons/contributions/ContributionsActivity.java @@ -62,7 +62,6 @@ public class ContributionsActivity super(WikiAccountAuthenticator.COMMONS_ACCOUNT_TYPE); } - private ServiceConnection uploadServiceConnection = new ServiceConnection() { public void onServiceConnected(ComponentName componentName, IBinder binder) { uploadService = (UploadService) ((HandlerService.HandlerServiceLocalBinder)binder).getService(); @@ -75,8 +74,6 @@ public class ContributionsActivity } }; - - @Override protected void onDestroy() { super.onDestroy(); @@ -85,7 +82,6 @@ public class ContributionsActivity } } - @Override protected void onResume() { super.onResume(); @@ -116,7 +112,6 @@ public class ContributionsActivity setTitle(R.string.title_activity_contributions); setContentView(R.layout.activity_contributions); - contributionsList = (ContributionsListFragment)getSupportFragmentManager().findFragmentById(R.id.contributionsListFragment); getSupportFragmentManager().addOnBackStackChangedListener(this); @@ -129,7 +124,6 @@ public class ContributionsActivity getSupportActionBar().setDisplayHomeAsUpEnabled(true); } } - requestAuthToken(); } @@ -290,8 +284,7 @@ public class ContributionsActivity getSupportActionBar().setDisplayHomeAsUpEnabled(false); } } - - + public void refreshSource() { getSupportLoaderManager().restartLoader(0, null, this); } From a3a4d23f95e9126925888c54e2c3170f532994d3 Mon Sep 17 00:00:00 2001 From: misaochan Date: Fri, 1 Jul 2016 17:37:49 +1200 Subject: [PATCH 2/2] Add check for NPE --- .../src/main/java/fr/free/nrw/commons/CommonsApplication.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/commons/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/commons/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java index 320a1e5d9..626007614 100644 --- a/commons/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java +++ b/commons/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java @@ -203,6 +203,9 @@ public class CommonsApplication extends Application { } catch (IOException e) { e.printStackTrace(); return false; + } catch (NullPointerException e) { + e.printStackTrace(); + return false; } }