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

Merge pull request #427 from maskaravivek/npeFix

Browse source 
Fixes #426: Crash fix caused by NPE
This commit is contained in:
Josephine Lim 2017-03-12 20:41:37 +10:00 • committed by GitHub
commit fba9d49938
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/fr/free/nrw/commons/Utils.java
View file

@ -312,4 +312,8 @@ public class Utils {
} }
return title; return title;
} }
public static boolean isNullOrWhiteSpace(String value) {
return value == null || value.trim().isEmpty();
}
} }

9
app/src/main/java/fr/free/nrw/commons/modifications/ModificationsSyncAdapter.java
View file

@ -49,13 +49,16 @@ public class ModificationsSyncAdapter extends AbstractThreadedSyncAdapter {
String authCookie; String authCookie;
try { try {
authCookie = AccountManager.get(getContext()).blockingGetAuthToken(account, "", false); authCookie = AccountManager.get(getContext()).blockingGetAuthToken(account, "", false);
} catch (OperationCanceledException e) { } catch (OperationCanceledException | AuthenticatorException e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} catch (IOException e) { } catch (IOException e) {
Log.d("Commons", "Could not authenticate :("); Log.d("Commons", "Could not authenticate :(");
return; return;
} catch (AuthenticatorException e) { }
throw new RuntimeException(e);
if(Utils.isNullOrWhiteSpace(authCookie)) {
Log.d("Commons", "Could not authenticate :(");
return;
} }
MWApi api = CommonsApplication.createMWApi(); MWApi api = CommonsApplication.createMWApi();