mirror of
				https://github.com/commons-app/apps-android-commons.git
				synced 2025-10-31 14:53:59 +01:00 
			
		
		
		
	Merge 4.0-release into master (#5028)
* Fix string for custom selector * Fix bug #4950 back arrow still present on top-level activity (#4952) * Fix bug #4949 by correctly setting previous db version number (#4956) * Fix bug #4949 by correctly setting previous db version number * Fix failing tests * Fix bug #4959 by correctly setting previous db version number and updating the current db version (#4960) * Fix bug #4957 (#4961) * Update library to new version that handles older Java VMs Fixes #4972 I believe. * Versioning for v4.0.0 * Changelog for v4.0.0 * Fix bug #4984 Added queries for package name for Android API 30+ (#4987) * Update mapbox sdk version (#4989) * Versioning for v4.0.1 * Changelog for v4.0.1 * Remove network type information from NetworkUtils (#4996) * Remove network type information from NetworkUtils * Ignore dependent tests * Fix #4992 invert the equals condition to be null safe (#4995) * Fix java.lang.NullPointerException for username in ContributionBoundaryCallback (#5003) * Fix failing tests for PR #5003 (#5004) * Fix java.lang.NullPointerException for username in ContributionBoundaryCallback * Fix failing tests * Update Room DB Version (#5011) * Fix #5001 (#5010) * Fix DB update issue (#5016) * [WIP] Fix both timezone problem and saved date problem (#5019) * Fix both timezone problem and saved date problem * Fixaccidental test code and add comments * Add issue link to the comments * Fix format issue and null checks * Versioning for v4.0.2 * Changelog for v4.0.2 * Add "Report Violation" menu option (#5025) * Add "Report Violation" menu option * Update email template * Update email address * Fixed typo Co-authored-by: Josephine Lim <josephinelim86@gmail.com> * Versioning for v4.0.3 * Changelog for v4.0.3 Co-authored-by: Josephine Lim <josephinelim86@gmail.com> Co-authored-by: Nicolas Raoul <nicolas.raoul@gmail.com> Co-authored-by: neslihanturan <tur.neslihan@gmail.com>
This commit is contained in:
		
							parent
							
								
									1de8968fa8
								
							
						
					
					
						commit
						3cdfdcffe1
					
				
					 29 changed files with 406 additions and 72 deletions
				
			
		|  | @ -8,6 +8,7 @@ import android.telephony.TelephonyManager; | |||
| 
 | ||||
| import org.jetbrains.annotations.NotNull; | ||||
| import org.junit.Before; | ||||
| import org.junit.Ignore; | ||||
| import org.junit.Test; | ||||
| 
 | ||||
| import fr.free.nrw.commons.utils.model.NetworkConnectionType; | ||||
|  | @ -97,6 +98,7 @@ public class NetworkUtilsTest { | |||
|     } | ||||
| 
 | ||||
|     @Test | ||||
|     @Ignore("Fix these test with telemetry permission") | ||||
|     public void testCellular2GNetwork() { | ||||
|         Context mockContext = mock(Context.class); | ||||
|         Application mockApplication = mock(Application.class); | ||||
|  | @ -123,6 +125,7 @@ public class NetworkUtilsTest { | |||
|     } | ||||
| 
 | ||||
|     @Test | ||||
|     @Ignore("Fix these test with telemetry permission") | ||||
|     public void testCellular3GNetwork() { | ||||
|         Context mockContext = mock(Context.class); | ||||
|         Application mockApplication = mock(Application.class); | ||||
|  | @ -149,6 +152,7 @@ public class NetworkUtilsTest { | |||
|     } | ||||
| 
 | ||||
|     @Test | ||||
|     @Ignore("Fix these test with telemetry permission") | ||||
|     public void testCellular4GNetwork() { | ||||
|         Context mockContext = mock(Context.class); | ||||
|         Application mockApplication = mock(Application.class); | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Madhur Gupta
						Madhur Gupta