Compare commits
	
		
			12 Commits
		
	
	
		
			v171811311
			...
			v171811317
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|  | bdb71e9b14 | ||
|  | df22e7de15 | ||
|  | 6b3550396b | ||
|  | c70f1e31a6 | ||
|  | 695670e944 | ||
|  | 1028826788 | ||
|  | 82a8977c96 | ||
|  | 07d9ce1054 | ||
|  | 7da7d49277 | ||
|  | 9b45365441 | ||
|  | 91a7464bce | ||
|  | 51add226eb | 
| @@ -1,5 +1,7 @@ | ||||
| **1.7.x** | ||||
|  | ||||
| - Added experimental issue to set a default timeout. Should work for #238. | ||||
|  | ||||
| - Closing #220. | ||||
|  | ||||
| - Start of #238. "Add a quick shortcut to open the app on offline mode ?" | ||||
|   | ||||
| @@ -89,6 +89,7 @@ class AddSourceActivity : AppCompatActivity() { | ||||
|                 this, | ||||
|                 this@AddSourceActivity, | ||||
|                 prefs.getBoolean("isSelfSignedCert", false), | ||||
|                 prefs.getString("api_timeout", "-1").toLong(), | ||||
|                 prefs.getBoolean("should_log_everything", false) | ||||
|             ) | ||||
|         } catch (e: IllegalArgumentException) { | ||||
|   | ||||
| @@ -195,6 +195,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener { | ||||
|             this, | ||||
|             this@HomeActivity, | ||||
|             settings.getBoolean("isSelfSignedCert", false), | ||||
|             sharedPref.getString("api_timeout", "-1").toLong(), | ||||
|             shouldLogEverything | ||||
|         ) | ||||
|         items = ArrayList() | ||||
|   | ||||
| @@ -195,6 +195,7 @@ class LoginActivity : AppCompatActivity() { | ||||
|                 this, | ||||
|                 this@LoginActivity, | ||||
|                 isWithSelfSignedCert, | ||||
|                 -1L, | ||||
|                 isWithSelfSignedCert | ||||
|             ) | ||||
|  | ||||
|   | ||||
| @@ -95,6 +95,7 @@ class ReaderActivity : AppCompatActivity() { | ||||
|             this, | ||||
|             this@ReaderActivity, | ||||
|             prefs.getBoolean("isSelfSignedCert", false), | ||||
|             prefs.getString("api_timeout", "-1").toLong(), | ||||
|             prefs.getBoolean("should_log_everything", false) | ||||
|         ) | ||||
|  | ||||
|   | ||||
| @@ -60,6 +60,7 @@ class SourcesActivity : AppCompatActivity() { | ||||
|             this, | ||||
|             this@SourcesActivity, | ||||
|             prefs.getBoolean("isSelfSignedCert", false), | ||||
|             prefs.getString("api_timeout", "-1").toLong(), | ||||
|             prefs.getBoolean("should_log_everything", false) | ||||
|         ) | ||||
|         var items: ArrayList<Source> = ArrayList() | ||||
|   | ||||
| @@ -18,11 +18,13 @@ import retrofit2.Call | ||||
| import retrofit2.Retrofit | ||||
| import retrofit2.converter.gson.GsonConverterFactory | ||||
| import java.util.concurrent.ConcurrentHashMap | ||||
| import java.util.concurrent.TimeUnit | ||||
|  | ||||
| class SelfossApi( | ||||
|     c: Context, | ||||
|     callingActivity: Activity?, | ||||
|     isWithSelfSignedCert: Boolean, | ||||
|     timeout: Long, | ||||
|     shouldLog: Boolean | ||||
| ) { | ||||
|  | ||||
| @@ -38,16 +40,25 @@ class SelfossApi( | ||||
|             this | ||||
|         } | ||||
|  | ||||
|     fun OkHttpClient.Builder.maybeWithSettingsTimeout(timeout: Long): OkHttpClient.Builder = | ||||
|         if (timeout != -1L) { | ||||
|             this.readTimeout(timeout, TimeUnit.SECONDS) | ||||
|                 .connectTimeout(timeout, TimeUnit.SECONDS) | ||||
|         } else { | ||||
|             this | ||||
|         } | ||||
|  | ||||
|     fun Credentials.createAuthenticator(): DispatchingAuthenticator = | ||||
|         DispatchingAuthenticator.Builder() | ||||
|             .with("digest", DigestAuthenticator(this)) | ||||
|             .with("basic", BasicAuthenticator(this)) | ||||
|             .build() | ||||
|  | ||||
|     fun DispatchingAuthenticator.getHttpClien(isWithSelfSignedCert: Boolean): OkHttpClient.Builder { | ||||
|     fun DispatchingAuthenticator.getHttpClien(isWithSelfSignedCert: Boolean, timeout: Long): OkHttpClient.Builder { | ||||
|         val authCache = ConcurrentHashMap<String, CachingAuthenticator>() | ||||
|         return OkHttpClient | ||||
|             .Builder() | ||||
|             .maybeWithSettingsTimeout(timeout) | ||||
|             .maybeWithSelfSigned(isWithSelfSignedCert) | ||||
|             .authenticator(CachingAuthenticatorDecorator(this, authCache)) | ||||
|             .addInterceptor(AuthenticationCacheInterceptor(authCache)) | ||||
| @@ -78,7 +89,7 @@ class SelfossApi( | ||||
|             HttpLoggingInterceptor.Level.NONE | ||||
|         } | ||||
|  | ||||
|         val httpClient = authenticator.getHttpClien(isWithSelfSignedCert) | ||||
|         val httpClient = authenticator.getHttpClien(isWithSelfSignedCert, timeout) | ||||
|  | ||||
|         httpClient.addInterceptor(logging) | ||||
|  | ||||
|   | ||||
| @@ -53,7 +53,6 @@ class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(con | ||||
|             val settings = | ||||
|                 this.context.getSharedPreferences(Config.settingsName, Context.MODE_PRIVATE) | ||||
|             val sharedPref = PreferenceManager.getDefaultSharedPreferences(this.context) | ||||
|             val shouldLogEverything = sharedPref.getBoolean("should_log_everything", false) | ||||
|             val notifyNewItems = sharedPref.getBoolean("notify_new_items", false) | ||||
|  | ||||
|             db = Room.databaseBuilder( | ||||
| @@ -65,7 +64,8 @@ class LoadingWorker(val context: Context, params: WorkerParameters) : Worker(con | ||||
|                 this.context, | ||||
|                 null, | ||||
|                 settings.getBoolean("isSelfSignedCert", false), | ||||
|                 shouldLogEverything | ||||
|                 sharedPref.getString("api_timeout", "-1").toLong(), | ||||
|                 sharedPref.getBoolean("should_log_everything", false) | ||||
|             ) | ||||
|  | ||||
|             api.allItems().enqueue(object : Callback<List<Item>> { | ||||
|   | ||||
| @@ -114,6 +114,7 @@ class ArticleFragment : Fragment() { | ||||
|             context!!, | ||||
|             activity!!, | ||||
|             settings.getBoolean("isSelfSignedCert", false), | ||||
|             prefs.getString("api_timeout", "-1").toLong(), | ||||
|             prefs.getBoolean("should_log_everything", false) | ||||
|         ) | ||||
|  | ||||
|   | ||||
| @@ -136,6 +136,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity { | ||||
|                 || GeneralPreferenceFragment.class.getName().equals(fragmentName) | ||||
|                 || ArticleViewerPreferenceFragment.class.getName().equals(fragmentName) | ||||
|                 || OfflinePreferenceFragment.class.getName().equals(fragmentName) | ||||
|                 || ExperimentalPreferenceFragment.class.getName().equals(fragmentName) | ||||
|                 || DebugPreferenceFragment.class.getName().equals(fragmentName) | ||||
|                 || LinksPreferenceFragment.class.getName().equals(fragmentName) | ||||
|                 || ThemePreferenceFragment.class.getName().equals(fragmentName); | ||||
| @@ -384,6 +385,26 @@ public class SettingsActivity extends AppCompatPreferenceActivity { | ||||
|         } | ||||
|     } | ||||
|  | ||||
|     @TargetApi(Build.VERSION_CODES.HONEYCOMB) | ||||
|     public static class ExperimentalPreferenceFragment extends PreferenceFragment { | ||||
|         @Override | ||||
|         public void onCreate(Bundle savedInstanceState) { | ||||
|             super.onCreate(savedInstanceState); | ||||
|             addPreferencesFromResource(R.xml.pref_experimental); | ||||
|             setHasOptionsMenu(true); | ||||
|         } | ||||
|  | ||||
|         @Override | ||||
|         public boolean onOptionsItemSelected(MenuItem item) { | ||||
|             int id = item.getItemId(); | ||||
|             if (id == android.R.id.home) { | ||||
|                 getActivity().finish(); | ||||
|                 return true; | ||||
|             } | ||||
|             return super.onOptionsItemSelected(item); | ||||
|         } | ||||
|     } | ||||
|  | ||||
|  | ||||
|     @Override | ||||
|     public boolean onOptionsItemSelected(MenuItem item) { | ||||
|   | ||||
							
								
								
									
										
											BIN
										
									
								
								app/src/main/res/drawable-hdpi/ic_action_lab.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								app/src/main/res/drawable-hdpi/ic_action_lab.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 683 B | 
							
								
								
									
										
											BIN
										
									
								
								app/src/main/res/drawable-mdpi/ic_action_lab.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								app/src/main/res/drawable-mdpi/ic_action_lab.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 409 B | 
							
								
								
									
										
											BIN
										
									
								
								app/src/main/res/drawable-xhdpi/ic_action_lab.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								app/src/main/res/drawable-xhdpi/ic_action_lab.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 871 B | 
							
								
								
									
										
											BIN
										
									
								
								app/src/main/res/drawable-xxhdpi/ic_action_lab.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								app/src/main/res/drawable-xxhdpi/ic_action_lab.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 1.3 KiB | 
							
								
								
									
										
											BIN
										
									
								
								app/src/main/res/drawable-xxxhdpi/ic_action_lab.png
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										
											BIN
										
									
								
								app/src/main/res/drawable-xxxhdpi/ic_action_lab.png
									
									
									
									
									
										Normal file
									
								
							
										
											Binary file not shown.
										
									
								
							| After Width: | Height: | Size: 3.2 KiB | 
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -161,9 +161,11 @@ | ||||
|     <string name="loading_notification_title">Cargando...</string> | ||||
|     <string name="loading_notification_text">Selfoss está sincronizando tus artículos</string> | ||||
|     <string name="notification_channel_sync">Notificación de sincronización</string> | ||||
|     <string name="new_items_channel_sync">New items notification</string> | ||||
|     <string name="new_items_notification_title">New items !</string> | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="new_items_channel_sync">Notificación de elementos nuevos</string> | ||||
|     <string name="new_items_notification_title">¡Nuevos artículos!</string> | ||||
|     <string name="new_items_notification_text">%1$d artículos cargados.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notificarme cuando se sincronicen nuevos artículos.</string> | ||||
|     <string name="shortcut_offline">Sin conexión</string> | ||||
|     <string name="pref_api_timeout">Se acabó el tiempo de espera de la API</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d nouveaux articles synchronisés.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notification quand des nouveaux articles sont synchronisés.</string> | ||||
|     <string name="shortcut_offline">Hors ligne</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -161,9 +161,11 @@ | ||||
|     <string name="loading_notification_title">Cargando...</string> | ||||
|     <string name="loading_notification_text">Selfoss está sincronizando os teus ar tigos</string> | ||||
|     <string name="notification_channel_sync">Notificación de sincronización</string> | ||||
|     <string name="new_items_channel_sync">New items notification</string> | ||||
|     <string name="new_items_notification_title">New items !</string> | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="new_items_channel_sync">Notificación de actualizacións</string> | ||||
|     <string name="new_items_notification_title">Novo(s) elemento(s)!</string> | ||||
|     <string name="new_items_notification_text">%1$d novos elementos cargados.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notificarme cando se sincronicen novos elementos.</string> | ||||
|     <string name="shortcut_offline">Sen conexión</string> | ||||
|     <string name="pref_api_timeout">Acabouse o tempo de espera da API</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
| @@ -166,4 +166,6 @@ | ||||
|     <string name="new_items_notification_text">%1$d new items loaded.</string> | ||||
|     <string name="pref_switch_notify_new_items">Notify on new items synced.</string> | ||||
|     <string name="shortcut_offline">Offline</string> | ||||
|     <string name="pref_api_timeout">Api Timeout</string> | ||||
|     <string name="pref_header_experimental">Experimental</string> | ||||
| </resources> | ||||
|   | ||||
							
								
								
									
										9
									
								
								app/src/main/res/xml/pref_experimental.xml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								app/src/main/res/xml/pref_experimental.xml
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,9 @@ | ||||
| <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> | ||||
|     <EditTextPreference | ||||
|         android:inputType="number" | ||||
|         android:key="api_timeout" | ||||
|         android:selectAllOnFocus="true" | ||||
|         android:singleLine="true" | ||||
|         android:title="@string/pref_api_timeout" /> | ||||
|  | ||||
| </PreferenceScreen> | ||||
| @@ -32,4 +32,9 @@ | ||||
|         android:icon="@drawable/ic_info_black_24" | ||||
|         android:title="@string/pref_header_links"/> | ||||
|  | ||||
|     <header | ||||
|         android:fragment="apps.amine.bou.readerforselfoss.settings.SettingsActivity$ExperimentalPreferenceFragment" | ||||
|         android:icon="@drawable/ic_action_lab" | ||||
|         android:title="@string/pref_header_experimental"/> | ||||
|  | ||||
| </preference-headers> | ||||
|   | ||||
							
								
								
									
										24
									
								
								build.sh
									
									
									
									
									
								
							
							
						
						
									
										24
									
								
								build.sh
									
									
									
									
									
								
							| @@ -1,15 +1,31 @@ | ||||
| #!/bin/bash | ||||
|  | ||||
| git fetch --tags -p | ||||
|  | ||||
| BASE_VERSION="1.7" | ||||
| TODAYS_VERSION="1" | ||||
| LAST_TAG=$(git tag -l | sort -V | tail -1) | ||||
|  | ||||
| VERSION="${BASE_VERSION//./}$(date '+%y%m%j')$TODAYS_VERSION" | ||||
| INITIAL_VERSION="${BASE_VERSION//./}$(date '+%y%m%j')" | ||||
|  | ||||
| ./version.sh ${VERSION} $1 | ||||
| LAST_DAY_VERSION=$(echo $LAST_TAG | sed "s/v${INITIAL_VERSION}//") | ||||
| LAST_DAY_VERSION_LENGTH=$(echo "${#LAST_DAY_VERSION}") | ||||
|  | ||||
| if [[ "$LAST_DAY_VERSION_LENGTH" == "1" ]] | ||||
| then | ||||
|     TODAYS_VERSION=$(( $LAST_DAY_VERSION + 1 )) | ||||
| else | ||||
|     TODAYS_VERSION="1" | ||||
| fi | ||||
|  | ||||
| VERSION="${INITIAL_VERSION}${TODAYS_VERSION}" | ||||
|  | ||||
| PARAMS_EXCEPT_PUBLISH=$(echo $1 | sed 's/\-\-publish//') | ||||
|  | ||||
| ./version.sh ${VERSION} ${PARAMS_EXCEPT_PUBLISH} | ||||
|  | ||||
| if [[ "$@" == *'--publish'* ]] | ||||
| then | ||||
|     ./publish-version.sh ${VERSION} | ||||
| else | ||||
|     echo "Did not publish. If you wanted to do so, call the script with \"--publish\"." | ||||
|     echo "Did not publish. If you wanted to do so, call the script with \"--publish\" or \"--publish-local\"." | ||||
| fi | ||||
|   | ||||
| @@ -1,5 +1,7 @@ | ||||
| #!/bin/bash | ||||
|  | ||||
| # NOTE: This is copy/pasted in jenkins | ||||
|  | ||||
| rm -f version.txt | ||||
| printf "versionName=$1-github\nversionCode=$1" >> version.txt | ||||
|  | ||||
|   | ||||
		Reference in New Issue
	
	Block a user