8000 Underscore in author name fix. (#1982) · commons-app/apps-android-commons@b907a0a · GitHub
Skip to content

Commit b907a0a

Browse files
hoplite390neslihanturan
hoplite390
authored and
neslihanturan
committed
Underscore in author name fix. (#1982)
* Add "rawUsername" (without underscore instead of spaces) to SessionManager as Bundle to preserve string. * Update UploadController.java * Update UploadController.java * Update for my fork (#4) * Added resaons in dropdown list * Made changes * Fixed Conflicts * Shifted strings to String.xml * Localisation updates from https://translatewiki.net. * Remove unused mediawiki api dependency (#1991) * Categories with pipe suffix (#1873) * Bug fix issue #1826 Changes made : -Certain category names used to show suffixed with strings prefixed with pipe '|'. Removed everything after the pipe. As per the discussion on the thread, its safe to remove everything after the pipe, including the pipe * review suggested changes *Code formatting *Extracted out the index of pipe in a variable *Added issue link in comments * Remove libraries section from README (#1988) * Remove libraries section from README * Add wiki link to "libraries used" to README * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Localisation updates from https://translatewiki.net. * Main screen ui changes, fixes #725 Main screen UI overhaul (#1922) * Delete Contributions Activity content to rewrite it * Add layout for new Contributions Activity design * Bind views * Override auth cookie required * Add tabs and fragments method * Create ContributionsFragment which will hold ContributionsListFragment and MediaDetailsFragment * Add NearbyFragment which will hold NearbyMapFragment and NearbyListFragment * Add ContributionsActivityPagerAdapter inner class to manage view pager * Create strings will be written on tabs for contributions and nearby * Create setTabAndViewPagerSynchronisation method to sycn view pager and tab layout. If user swipe pages, tabs will also change (and vice versa) * Add theme dependent background color for Drawer Layout of activity_contributions layout file * Add theme dependent background color for tabs in main * Create Contributions Fragment structure which will hold Media Detail Fragment and Contributions List Fragment * Inifilate contributions list fragment view * Create variables and methods to reuse and create Media Detils Fragment and Contributions List Fragment which will be inside Contribution Fragment * Override cursor loader methods * set MediaDetilsView fragment or ContributionListFragment according to users state * Show details of an image when item is clicked * Add delete and retry functionality, note: not tested yet * Override media count methods * Implement onBack Pressed settings * Register and unregister datasetObservers * Add contributin list fragment * Add contribution list layout with FABs for camera and galerry * Make sure we called onAuthAcquired from fragment after is is attached * Create ContributionListViewUtils class to change visibility of views according to MediaDetailsFragment visiblity or their loading state * Make number of uploads visible if contribution list is visible and number of uploads is uploaded. Progress bar is visible if contribution list is visible and number of uploads are uploading. Both invisible if Media Details Fragment is visible * Return parent fragment instead of parent activity * GetPagerFragment instead of getActivity since currently ContributionsFragment take over responsibility from ContributionsActivity * Add contribution number next to tab text for contribution, as discussed in thread * Remove number of uploads from contributions fragment since we moved it text of tab layout * Add unread notifications asynctask to check unread notifications on background * Save latest time user notification activity viewed * Add shared preferences provider for latest notification activity visit time * Add shared preferences provider for latest notification activity visit time * Change notification icon (add blue dot) whenever a notification comes * Recover notifications state on come back to contributions list from media details fragment * Add date with year parameter to Notification class, because we will use it on comparasion of dates * Check if user visited noifications activity after last notification came * Add ation to notification icon * Add nearby custom card view class * Add card view to activity * Add a button which will be displayed when nearby permission is not granted thus closest point can't be displayed on main screen. Besides, theme dependent click styles are added to button * Add button click and permission request logic. Not: solve why location manager is null * Inject location manager to activity instead * Make card view dismissable with swip * Add preference to disable or display closest nearby location * Add a bugfix to set visibility of nearby notification cardview * Add UI modifier methods to display notifications * Modify getFromWikidataQuery method, so that based on the restunClosestResult boolean, we get only the closest nearby place, instead of fetching bunch of nearby places each time * Make inner class vaariables public to reach them out of package * Temporarily comment out icon setter methods since it crashes under API19 * Inject location manager * Register location manager accoring to permission is given, then call nearby card view updater methods * Change method calls loadAttractionsFromLocation by considering new parameter to decide between closest nearby call or an usual nearby call * Add progress bar to nearby cardview * Fix notifications string * Hide nearby card view when Media Details is visible * Change tab on nerby card view click * Add hardcoded strings to strings.xml * Move nearby activity to new nearby frament * Add fragments for nearby list and map into outer nearby fragment * Change options menu item according to tab view * Make nearby card view invisible on swipe to nearby tab * Use retained nearby fragment * Add action to list sheet button * This commit caused contrib list become invisible thus, Revert "Use retained nearby fragment" This reverts commit 86b3633. * Make sure retained fragments are used for -both- nearby and contrib fragments * Remove unrelated part added because of confusion, sorry * Make sure nearbyNotificationCardView visibility works corrent * Move nearby methods from nerby activity to nearby fragment, and add a lastLocationDuplicate variable to distinguish first time location from nearby fragment and nearby notification card on contributions activity * Change activity.findViewByID lines with parentFragment.view.findViewById * Remove toolbar from nearby fragment, since contributions activity already has * Disable view pager swipe, since using map is very hard with swipe option of view pager * Place progress bar inside nearby card notification to center * Make sure using retaied nearby map fragment and nearby list fragment inside nearby fragment * Update nearby notification content on slight location updates too, if it is first update after on resume. This prevented very long time loading progress bar * Add case for no nearest pleace found, to prevent bug * Prevent a possible bug can be caused from activity already killed * Add click actions to FAB buttons in contributions list fragment. And arrange FAB margins * Try to use a new location manager instance instead of using single object for both nearby map and nearby notification card view. Because location manager has a state mechanism which is designed to be called from a single point. When I call same methods from both nearby card view notification and nearby map, next update time of map etc. gets confused. * Set radius to initial value on getFromWikidataQuery (when it is called for getting closest result to be used in nearby card view notification). Normally, algorithm increase radius, this technique works for nearby map but when it comes to finding nearest point, it can return null * Add an enum to make card view visibility more stable, however, still there is a bug. * Prevent some more nearby card view visilbility bugs, however still there is a bug * Add some nullchecks for precaution * Check nearby permission and refresh nearby view if nearby tab selected, othervise do nothing * Send user to contrib tab if permission is denied after masrhmallow * Change nearby fragment background so that progress bar is visible now * Reduce code duplicate * request location and gps permission from contribution nearby car view too * Make sure using retained fragments * Make sure Contrib list fragment is retained on orientation change * Fix NPE at options menu * Make fragment flag fancier, define it per fragment instance, instead of activity * Fix Service leak and onsavedInstance NPE errrors both occured on orientation change * Refresh nearby map on orientation change * Remove unused imports, organise logs and add comments for NearbyMapFragment class * Remove all references of nearby activity, since we don't use it anymore * Remove unused imports, organise logs and add comments for Nearby Controller * Remove unused imports, organise logs and add comments for NearbyFragment * Remove unused imports, organise logs and add comments for NearbyNotificationCardView * Change class name from Contributions Activity to Main Activity. Remove unused imports, organise logs and add comments for MainAtivity * Remove extra spaces * Remove unused imports and logs * Remove unused imports, organise logs and add comments for LocationServiceManager * Remove unused imports, organise logs and add comments for NotificationsActivity * Remove unused imports, organise logs and add comments for Contributions Fragment * bug fix nearby notification card dismiss/restore issue * Change display_nearby_notification_summary varibale with Tap here to see the nearest place that needs pictures * Add nearest place notification card dismiss toast * Fix mistake made on previous commit, while fixing conflicts * Set no data yet message invisible after contributions list is loaded * Change FAB margins, according to Josephine's review * Change FAB margins, according to Josephine's review * Change contributions list background to white, to make FAB more visible * Add infobutton with popup window next to nearby tba, to explain what does this tab do * Change hambuger icon to back arrow when media details activity visible * On back button clicked from nearby fragment, switch back to contributions fragment, instead of closing the app * Check nearby card view visibility on coming back from media details activity * Change notification icon with default vector supplied by android vector repos. If we use the one I drawn on inkscape, produced vector is not compatible with API level 19 and below. I couldn't find a proper solution, and decided to change icon * Fix a possible NPE, caused by loation manager has Main activity reference after it is destroyed * Change hardcoded string with var from string xml * Make sure you listen storage permissions from contribution list framgent FABs * Make sure you listened storage permissions for Neaby fragment buttons too * Check NPEs causing crashes. Now it does not crash after coming back from settings activity * Make notification icon compatible with <API19 devices, by drawing and using .png images * Change back icon arrow vector with png * Attempt to solve location manager caused memory leak * Fix memory leaks and optimize imports * Merge 2.9 release * Small ui fixes on new main ui (#1995) * Return to main activity from notifications activity on back button is pressed * Make nearby info image a little far from nearby text, to prevent wrong clicks * Bug fix issue #1999 (#2000) * Added a threshold on swipe, ie. if a swipe is considered a swipe only if it covers a distance of 100dp * Multiple uploads with over haul (#1968) * Added new upload activity that receives shared files from the gallery. Cards show and hide, plus titles are correct. Displayed thumbnails for the shared images * Better handling of the view paging plus error handling for required fields. * Code cleanup to make things more readable. * Extracted a model from the category search fragment that can possibly be shared with the new upload activity. * Added category selection to the combined upload screen. * Cleanup before the home-stretch on the GUI. * Adding license selection. * Fixed build warnings + cleanup * Start to support the dark theme. * Work in progress to add quality checking. * Fixing merge. * GPSExtractor: optimized away the EXifInterface object * Implemented submit functionality, temporarily fixed jacoco crash by disabling DUMMY UploadView object. * Implemented uploading of categories along with the picture. The category screen now displays GPS and recent categories when nothing is searched. * Implemented caching of files. Did some work on picture quality detection. * Implemented too dark picture detection. * Added a side card for zoom and map buttons along with pretty animations for stuff. * Added duplicate image on commons checking and fixed files not getting proper file extensions in several places. * Added support for map button and switched in-app upload buttons to UploadActivity * Pretty pretty animations! * Implemented zoom functionality for th background image. Just pinching on the image works instead of requiring buttons. * Added multi-language descriptions with categories by region. * Reimplemented the duplicate title checker and implemented a check against putting the same language twice in the description. * Javadocs for Description and UploadPresenter, plus some general cleanup. * Small code changes. * Implemented login checks for the Upload screen. * Implement receiving data from Nearby. * Feature/permissions library (#1855) * Added permission for Dexter, the runtime permission handling library * [Preparing fir issue #1773] Added a utility function which would take the user to app settings screen where he could manually give us the required permission * Added an alert dialog with positive and negative callback [Preparing fir issue #1773] * Improvements in the way External Storage Permission is handled in MultipleShareActivity[Bug fix #1697] 1. Used dexter to handle the external storage permission 2. Behaviour changes : When user tries to share(uppload) images to commons via MultipleShareActivity, following decision tree is followed a. If the app has permission for external storage, normal upload operation is followed b. If the app does not has the permission for external storage, dexter is used to ask for the same c. If the user gives us the required permission, normal upload flow is proceeded d. If the doesnot gives us the required permission a rationale dialog is shown with the appropriate message to let him know why we need the permission e. If he presses okay, steps a-c are followed and if he presses cancel, we close the app. f. If while asking for permission, the user chooses never ask again, then next time he tries to upload an image via MSA, the rational dialog follows the app setting screen where he could manually give us the required permission and the onActivityResult of same is handled * Added a Constants class to handle request and result codes from one place and other related constants common to the a 8000 ll app elements * replaced hardcoded strings ok and cancel in DialogUtil to string resources * init permission rationale dialog in activities onCreate * Code formatting, updated access modifiers wherever required, added javadocs for new methods created * *shifted constants to app class *Added JavaDocs in PermissionUtils * removed class REQUEST_CODES from CommonsApplication and instead put the enclosing constants in the App class itself * Made Codacy happy. * Abstarcted permission acquisition into new class DexterPermissionObtainer * Fixed Nearby upload detection * Migrated bad picture detection from AsyncTask to RxJava. * Removed ShareActivity and related dead code * Removed dead or duplicate code from FileProcessor * Added info button to title EditText * Fixed the add description button not disappearing. Added "Starting Upload" toast. Added link to the license on final screen. Made it so that the map button is hidden when image lacks gps coords. * Support in app multiple uploads * Minor changes to fix build * Changes to fix pending issues with upload flow * Fix display of similar image fragment * When uploading several files at once the date is missing #1854 (#2) * Bug fix issue #1854 * updated ContributionsDao to save create date, which it was not doing currently [it was instead saving current date] * UploadItem accepts are dateCreated param * Added a function in UploadModel, getFileCreatedDate which tries to fetched the file creaction date from all possible content providers. * Fix pending issues in upload flow * Make multiple uploads work for Google Photos * Fix default state for upload activity * Fix keyboard state for license screen * Fix descriptions for uploads * wip * Fix language spinner * Fix visibility error on media details view (#2009) * Localisation updates from https://translatewiki.net. * Update UploadController.java * Repair gradle file Repair gradle build file so that it uses buildToolsVersion buildToolsVersion. * Repair gradle repair gradle * repair gradle repair gradle to fix Travis * Update UpdateModel() sessionManager.getUserName() >> sessionManager.getRawUserName() It will build new Contribution with stored username string without underscore. * Add getAuthorName. In case getRawUserName return null as described in #1982 this method, will return getUsername. Users with underscore issue will see the fix after re-log.
1 parent 57c7fd3 commit b907a0a

File tree

5 files changed

+27
-12
lines changed

5 files changed

+27
-12
lines changed

‎app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,14 +215,15 @@ private void performLogin() {
215215
loginCurrentlyInProgress = true;
216216
Timber.d("Login to start!");
217217
final String username = canonicializeUsername(usernameEdit.getText().toString());
218+
final String rawUsername = Utils.capitalize(usernameEdit.getText().toString().trim());
218219
final String password = passwordEdit.getText().toString();
219220
String twoFactorCode = twoFactorEdit.getText().toString();
220221

221222
showLoggingProgressBar();
222223
Observable.fromCallable(() -> login(username, password, twoFactorCode))
223224
.subscribeOn(Schedulers.io())
224225
.observeOn(AndroidSchedulers.mainThread())
225-
.subscribe(result -> handleLogin(username, password, result));
226+
.subscribe(result -> handleLogin(username, rawUsername, password, result));
226227
}
227228

228229
private String login(String username, String password, String twoFactorCode) {
@@ -238,10 +239,10 @@ private String login(String username, String password, String twoFactorCode) {
238239
}
239240
}
240241

241-
private void handleLogin(String username, String password, String result) {
242+
private void handleLogin(String username, String rawUsername, String password, String result) {
242243
Timber.d("Login done!");
243244
if (result.equals("PASS")) {
244-
handlePassResult(username, password);
245+
handlePassResult(username, rawUsername , password);
245246
} else {
246247
loginCurrentlyInProgress = false;
247248
errorMessageShown = true;
@@ -259,7 +260,7 @@ private void showLoggingProgressBar() {
259260
progressDialog.show();
260261
}
261262

262-
private void handlePassResult(String username, String password) {
263+
private void handlePassResult(String username, String rawUsername, String password) {
263264
showSuccessAndDismissDialog();
264265
requestAuthToken();
265266
AccountAuthenticatorResponse response = null;
@@ -276,7 +277,7 @@ private void handlePassResult(String username, String password) {
276277
}
277278
}
278279

279-
sessionManager.createAccount(response, username, password);
280+
sessionManager.createAccount(response, username, rawUsername, password);
280281
startMainActivity();
281282
}
282283

‎app/src/main/java/fr/free/nrw/commons/auth/SessionManager.java

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ public class SessionManager {
2828
private final MediaWikiApi mediaWikiApi;
2929
private Account currentAccount; // Unlike a savings account... ;-)
3030
private SharedPreferences sharedPreferences;
31-
31+
private static final String KEY_RAWUSERNAME = "rawusername";
32+
private Bundle userdata = new Bundle();
3233

3334
public SessionManager(Context context,
3435
MediaWikiApi mediaWikiApi,
@@ -44,13 +45,15 @@ public SessionManager(Context context,
4445
*
4546
* @param response
4647
* @param username
48+
* @param rawusername
4749
* @param password
4850
*/
4951
public void createAccount(@Nullable AccountAuthenticatorResponse response,
50-
String username, String password) {
52+
String username, String rawusername, String password) {
5153

5254
Account account = new Account(username, BuildConfig.ACCOUNT_TYPE);
53-
boolean created = accountManager().addAccountExplicitly(account, password, null);
55+
userdata.putString(KEY_RAWUSERNAME, rawusername);
56+
boolean created = accountManager().addAccountExplicitly(account, password, userdata);
5457

5558
Timber.d("account creation " + (created ? "successful" : "failure"));
5659

@@ -97,6 +100,17 @@ public String getUserName() {
97100
return account == null ? null : account.name;
98101
}
99102

103+
@Nullable
104+
public String getRawUserName() {
105+
Account account = getCurrentAccount();
106+
return account == null ? null : accountManager().getUserData(account, KEY_RAWUSERNAME);
107+
}
108+
109+
public String getAuthorName(){
110+
return getRawUserName() == null ? getUserName() : getRawUserName();
111+
}
112+
113+
100114
@Nullable
101115
public String getPassword() {
102116
Account account = getCurrentAccount();

‎app/src/main/java/fr/free/nrw/commons/upload/UploadController.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public void startUpload(final Contribution contribution, final ContributionUploa
110110
sessionManager.forceLogin(context);
111111
return;
112112
}
113-
contribution.setCreator(currentAccount.name);
113+
contribution.setCreator(sessionManager.getAuthorName());
114114
}
115115

116116
if (contribution.getDescription() == null) {

‎app/src/main/java/fr/free/nrw/commons/upload/UploadModel.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ Observable<Contribution> buildContributions(List<String> categoryStringList) {
312312
{
313313
Contribution contribution = new Contribution(item.mediaUri, null, item.title + "." + item.fileExt,
314314
Description.formatList(item.descriptions), -1,
315-
null, null, sessionManager.getUserName(),
315+
null, null, sessionManager.getAuthorName(),
316316
CommonsApplication.DEFAULT_EDIT_SUMMARY, item.gpsCoords.getCoords());
317317
contribution.setWikiDataEntityId(item.wikidataEntityId);
318318
contribution.setCategories(categoryStringList);
@@ -397,4 +397,4 @@ static class UploadItem {
397397
}
398398
}
399399

400-
}
400+
}

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#Sat Aug 25 23:38:03 EDT 2018
1+
#Sat Nov 03 11:02:51 CET 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)