Age | Commit message (Collapse) | Author |
|
|
|
Conflicts:
src/se/leap/bitmaskclient/ProviderAPI.java
res/values/strings.xml (Re-add lines removed in 7297632a01d5fb606b901d8c54e190e28b95716e )
|
|
into develop
Also merge branch 'feature/change-or-remove-user-facing-references-to-ics-android' into develop
|
|
Log window Activity is gone with ics-openvpn purge.
We will want it back, but we will bring back only what's needed.
|
|
|
|
I've refactored a string name and the content of that string so that no
references to legacy ics-openvpn user interface are present in there.
|
|
That means there is no unnecessary file, nor resource, in the project
right now.
Conflicts:
res/values-ca/strings.xml
res/values-cs/strings.xml
res/values-de/strings.xml
res/values-es/strings.xml
res/values-et/strings.xml
res/values-fr/strings.xml
res/values-id/strings.xml
res/values-it/strings.xml
res/values-ja/strings.xml
res/values-ko/strings.xml
res/values-nl/strings.xml
res/values-no/strings.xml
res/values-ro/strings.xml
res/values-ru/strings.xml
res/values-uk/strings.xml
res/values-zh-rCN/strings.xml
res/values-zh-rTW/strings.xml
res/values/strings.xml
res/values/untranslatable.xml
res/xml/main_headers.xml
|
|
|
|
|
|
This classes were an obvious choice, there may be more unused classes
around there.
Conflicts:
src/se/leap/bitmaskclient/ProviderListFragment.java
|
|
|
|
Tested both in real device with Cyanogenmod 4.3.1 and in api 18
emulator.
Next step: wi-fi toggling.
|
|
Used in tests, but it's going to be used in the near future when
blocking data connections until EIP is on.
|
|
It shouldn't expect the previous provider to be back again pressing the
back button after hitting "Switch provider".
|
|
Look at https://leap.se/code/issues/5062#note-3:
I'm going to remove android-support-v4.jar from .gitignore based on https://developer.android.com/tools/support-library/index.html#overview and http://www.in-nomine.org/2012/02/26/adding-android-support-v4-to-your-android-application-in-intellij-idea/
|
|
|
|
This means we obtain the SharedPreferences object each time we want to
use it. This yields to longer code lines while reading and writing to
them.
|
|
|
|
develop
|
|
|
|
Conflicts:
src/se/leap/bitmaskclient/ConfigurationWizard.java
src/se/leap/bitmaskclient/Dashboard.java
src/se/leap/bitmaskclient/ProviderAPI.java
src/se/leap/bitmaskclient/ProviderListFragment.java
|
|
|
|
|
|
|
|
|
|
|
|
I've also removed some spaces from the text.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
It also (supposedly, I didn't test because Bitmask is working ok from our client point of view) distinguishes between cancelling a new custom provider and cancelling a preseeded provider.
|
|
The user can change the new provider's data entered before failing.
|
|
|
|
|
|
|
|
Next step: remove the provider from the list (big security hole, since all providers present on the list are assumed to be secure).
|
|
|
|
ProviderAPI has now 3 different static variables, each one for the 3 files that have to be downloaded to set up a provider.
|
|
|
|
I/O error at login phase fixed.
|
|
Setting up a provider makes the progressbar move according to the number of files downloaded (1/3, 2/3, 3/3).
Next step: recover from download errors individually. That means that if a download fails but the others went OK, the user will be prompted to retry that individual failing download.
|
|
|
|
This method uses another 3 to download each file.
Next step: broadcast progress and remove unnecessary methods.
|
|
|
|
Adding a new provider is the same that selecting a new one, using the same methods and following the same workflow.
|
|
I've refactored everything to be able to remove all but provider.json
url at urls files.
|