diff options
Diffstat (limited to 'app')
30 files changed, 41 insertions, 17 deletions
diff --git a/app/build.gradle b/app/build.gradle index 088be987..57cdf228 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -329,6 +329,7 @@ dependencies { implementation 'androidx.multidex:multidex:2.0.0' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0' + implementation 'de.hdodenhof:circleimageview:3.1.0' implementation project(path: ':shapeshifter') } diff --git a/app/src/custom/res/drawable-land/background_main.png b/app/src/custom/res/drawable-land/background_main.png Binary files differnew file mode 100644 index 00000000..5e22dfa1 --- /dev/null +++ b/app/src/custom/res/drawable-land/background_main.png diff --git a/app/src/custom/res/drawable-land/background_main.webp b/app/src/custom/res/drawable-land/background_main.webp Binary files differdeleted file mode 100644 index c28c2183..00000000 --- a/app/src/custom/res/drawable-land/background_main.webp +++ /dev/null diff --git a/app/src/custom/res/drawable-land/ic_splash_background.png b/app/src/custom/res/drawable-land/ic_splash_background.png Binary files differnew file mode 100644 index 00000000..8d8ed3d1 --- /dev/null +++ b/app/src/custom/res/drawable-land/ic_splash_background.png diff --git a/app/src/custom/res/drawable-land/ic_splash_background.webp b/app/src/custom/res/drawable-land/ic_splash_background.webp Binary files differdeleted file mode 100644 index f939c114..00000000 --- a/app/src/custom/res/drawable-land/ic_splash_background.webp +++ /dev/null diff --git a/app/src/custom/res/drawable-nodpi/background_drawer.png b/app/src/custom/res/drawable-nodpi/background_drawer.png Binary files differnew file mode 100644 index 00000000..0c42b73c --- /dev/null +++ b/app/src/custom/res/drawable-nodpi/background_drawer.png diff --git a/app/src/custom/res/drawable-nodpi/background_main.png b/app/src/custom/res/drawable-nodpi/background_main.png Binary files differnew file mode 100644 index 00000000..c01e26c3 --- /dev/null +++ b/app/src/custom/res/drawable-nodpi/background_main.png diff --git a/app/src/custom/res/drawable-nodpi/ic_splash_background.png b/app/src/custom/res/drawable-nodpi/ic_splash_background.png Binary files differnew file mode 100644 index 00000000..6a06ddc9 --- /dev/null +++ b/app/src/custom/res/drawable-nodpi/ic_splash_background.png diff --git a/app/src/custom/res/drawable-sw600dp-port/background_main.png b/app/src/custom/res/drawable-sw600dp-port/background_main.png Binary files differnew file mode 100644 index 00000000..c01e26c3 --- /dev/null +++ b/app/src/custom/res/drawable-sw600dp-port/background_main.png diff --git a/app/src/custom/res/drawable-sw600dp-port/background_main.webp b/app/src/custom/res/drawable-sw600dp-port/background_main.webp Binary files differdeleted file mode 100644 index 6d23e9e1..00000000 --- a/app/src/custom/res/drawable-sw600dp-port/background_main.webp +++ /dev/null diff --git a/app/src/custom/res/drawable-sw600dp-port/ic_splash_background.png b/app/src/custom/res/drawable-sw600dp-port/ic_splash_background.png Binary files differnew file mode 100644 index 00000000..6a06ddc9 --- /dev/null +++ b/app/src/custom/res/drawable-sw600dp-port/ic_splash_background.png diff --git a/app/src/custom/res/drawable-sw600dp-port/ic_splash_background.webp b/app/src/custom/res/drawable-sw600dp-port/ic_splash_background.webp Binary files differdeleted file mode 100644 index 227fcb24..00000000 --- a/app/src/custom/res/drawable-sw600dp-port/ic_splash_background.webp +++ /dev/null diff --git a/app/src/custom/res/drawable-sw600dp/background_main.png b/app/src/custom/res/drawable-sw600dp/background_main.png Binary files differnew file mode 100644 index 00000000..9ec4de06 --- /dev/null +++ b/app/src/custom/res/drawable-sw600dp/background_main.png diff --git a/app/src/custom/res/drawable-sw600dp/background_main.webp b/app/src/custom/res/drawable-sw600dp/background_main.webp Binary files differdeleted file mode 100644 index aa6b452b..00000000 --- a/app/src/custom/res/drawable-sw600dp/background_main.webp +++ /dev/null diff --git a/app/src/custom/res/drawable-sw600dp/ic_splash_background.png b/app/src/custom/res/drawable-sw600dp/ic_splash_background.png Binary files differnew file mode 100644 index 00000000..6b8c753f --- /dev/null +++ b/app/src/custom/res/drawable-sw600dp/ic_splash_background.png diff --git a/app/src/custom/res/drawable-sw600dp/ic_splash_background.webp b/app/src/custom/res/drawable-sw600dp/ic_splash_background.webp Binary files differdeleted file mode 100644 index f1a035ec..00000000 --- a/app/src/custom/res/drawable-sw600dp/ic_splash_background.webp +++ /dev/null diff --git a/app/src/custom/res/drawable/background_drawer.webp b/app/src/custom/res/drawable/background_drawer.webp Binary files differdeleted file mode 100644 index 8e0c4a6f..00000000 --- a/app/src/custom/res/drawable/background_drawer.webp +++ /dev/null diff --git a/app/src/custom/res/drawable/background_main.webp b/app/src/custom/res/drawable/background_main.webp Binary files differdeleted file mode 100644 index 6d23e9e1..00000000 --- a/app/src/custom/res/drawable/background_main.webp +++ /dev/null diff --git a/app/src/custom/res/drawable/ic_splash_background.webp b/app/src/custom/res/drawable/ic_splash_background.webp Binary files differdeleted file mode 100644 index 227fcb24..00000000 --- a/app/src/custom/res/drawable/ic_splash_background.webp +++ /dev/null diff --git a/app/src/custom/res/drawable/logo_square.png b/app/src/custom/res/drawable/logo_square.png Binary files differnew file mode 100644 index 00000000..3cec6cec --- /dev/null +++ b/app/src/custom/res/drawable/logo_square.png diff --git a/app/src/custom/res/drawable/logo_square.webp b/app/src/custom/res/drawable/logo_square.webp Binary files differdeleted file mode 100644 index cd3ad9d0..00000000 --- a/app/src/custom/res/drawable/logo_square.webp +++ /dev/null diff --git a/app/src/main/java/se/leap/bitmaskclient/CustomProviderSetupActivity.java b/app/src/main/java/se/leap/bitmaskclient/CustomProviderSetupActivity.java index 29d1b09e..0974f427 100644 --- a/app/src/main/java/se/leap/bitmaskclient/CustomProviderSetupActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/CustomProviderSetupActivity.java @@ -37,7 +37,7 @@ public class CustomProviderSetupActivity extends ProviderSetupBaseActivity { super.onCreate(savedInstanceState); setUpInitialUI(); restoreState(savedInstanceState); - setProvider(new Provider(BuildConfig.customProviderUrl, BuildConfig.customProviderIp, BuildConfig.customProviderApiIp)); + setProvider(new Provider(BuildConfig.customProviderUrl, BuildConfig.geoipUrl, BuildConfig.customProviderIp, BuildConfig.customProviderApiIp)); } @Override diff --git a/app/src/main/java/se/leap/bitmaskclient/FeatureVersionCode.java b/app/src/main/java/se/leap/bitmaskclient/FeatureVersionCode.java index 969f006a..3b67d96b 100644 --- a/app/src/main/java/se/leap/bitmaskclient/FeatureVersionCode.java +++ b/app/src/main/java/se/leap/bitmaskclient/FeatureVersionCode.java @@ -3,4 +3,5 @@ package se.leap.bitmaskclient; public interface FeatureVersionCode { int MULTIPLE_PROFILES = 132; int RENAMED_EIP_IN_PREFERENCES = 132; + int GEOIP_SERVICE = 148; } diff --git a/app/src/main/java/se/leap/bitmaskclient/FragmentManagerEnhanced.java b/app/src/main/java/se/leap/bitmaskclient/FragmentManagerEnhanced.java index 4d0d4785..f4215e89 100644 --- a/app/src/main/java/se/leap/bitmaskclient/FragmentManagerEnhanced.java +++ b/app/src/main/java/se/leap/bitmaskclient/FragmentManagerEnhanced.java @@ -34,7 +34,6 @@ public class FragmentManagerEnhanced { if (previousFragment != null) { transaction.remove(previousFragment); } - transaction.addToBackStack(null); return transaction; } diff --git a/app/src/main/java/se/leap/bitmaskclient/Provider.java b/app/src/main/java/se/leap/bitmaskclient/Provider.java index 186ce11e..ce428a54 100644 --- a/app/src/main/java/se/leap/bitmaskclient/Provider.java +++ b/app/src/main/java/se/leap/bitmaskclient/Provider.java @@ -571,7 +571,8 @@ public final class Provider implements Parcelable { } /** - * resets everything except the main url and the providerIp + * resets everything except the main url, the providerIp and the geoip + * service url (currently preseeded) */ public void reset() { definition = new JSONObject(); diff --git a/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java b/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java index 4f555f94..44258a7b 100644 --- a/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/ProviderListBaseActivity.java @@ -19,9 +19,10 @@ package se.leap.bitmaskclient; import android.content.Intent; import android.os.Bundle; -import androidx.annotation.NonNull; import android.widget.ListView; +import androidx.annotation.NonNull; + import com.pedrogomez.renderers.Renderer; import java.util.ArrayList; @@ -31,7 +32,6 @@ import javax.inject.Inject; import butterknife.InjectView; import butterknife.OnItemClick; -import se.leap.bitmaskclient.fragments.AboutFragment; import static se.leap.bitmaskclient.Constants.REQUEST_CODE_ADD_PROVIDER; import static se.leap.bitmaskclient.Constants.REQUEST_CODE_CONFIGURE_LEAP; diff --git a/app/src/main/java/se/leap/bitmaskclient/StartActivity.java b/app/src/main/java/se/leap/bitmaskclient/StartActivity.java index dd4878f3..9937eeeb 100644 --- a/app/src/main/java/se/leap/bitmaskclient/StartActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/StartActivity.java @@ -31,6 +31,7 @@ import java.lang.annotation.RetentionPolicy; import de.blinkt.openvpn.core.VpnStatus; import se.leap.bitmaskclient.eip.EipCommand; +import se.leap.bitmaskclient.utils.PreferenceHelper; import static se.leap.bitmaskclient.Constants.APP_ACTION_CONFIGURE_ALWAYS_ON_PROFILE; import static se.leap.bitmaskclient.Constants.EIP_RESTART_ON_BOOT; @@ -143,6 +144,17 @@ public class StartActivity extends Activity{ } } + if (hasNewFeature(FeatureVersionCode.GEOIP_SERVICE)) { + // deletion of current configured provider so that the geoip url will picked out + // from the preseeded *.url file / geoipUrl buildconfigfield (build.gradle) during + // next setup + Provider provider = ProviderObservable.getInstance().getCurrentProvider(); + if (provider != null && !provider.isDefault()) { + PreferenceHelper.deleteProviderDetailsFromPreferences(preferences, provider.getDomain()); + ProviderObservable.getInstance().updateProvider(null); + } + } + // ensure all upgrades have passed before storing new information storeAppVersion(); } diff --git a/app/src/main/res/layout/donation_reminder_dialog.xml b/app/src/main/res/layout/donation_reminder_dialog.xml index dc16906b..3af36086 100644 --- a/app/src/main/res/layout/donation_reminder_dialog.xml +++ b/app/src/main/res/layout/donation_reminder_dialog.xml @@ -32,20 +32,12 @@ android:gravity="center" android:text="@string/donate_message" /> - <androidx.cardview.widget.CardView + <de.hdodenhof.circleimageview.CircleImageView + android:id="@+id/donation_logo" android:layout_width="120dp" android:layout_height="120dp" - android:innerRadius="0dp" - android:shape="ring" - app:cardCornerRadius="60dp"> - <ImageView - android:id="@+id/donation_logo" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:scaleType="centerCrop" - app:srcCompat="@drawable/donation_img" /> - </androidx.cardview.widget.CardView> - + android:src="@drawable/donation_img" + /> <Button android:id="@+id/btnDonate" diff --git a/app/src/main/res/layout/f_about.xml b/app/src/main/res/layout/f_about.xml index 86be3a56..22053054 100644 --- a/app/src/main/res/layout/f_about.xml +++ b/app/src/main/res/layout/f_about.xml @@ -250,6 +250,21 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/copyright_shapeshifter_transports" /> + + <Space + android:layout_width="match_parent" + android:layout_height="20sp" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/circleImageView" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/copyright_circleImageView" /> </LinearLayout> </ScrollView> diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml index 50e44fce..0d680b96 100644 --- a/app/src/main/res/values/untranslatable.xml +++ b/app/src/main/res/values/untranslatable.xml @@ -41,4 +41,7 @@ <string name="copyright_shapeshifter_transports" translatable="false">Copyright (c) 2014, Yawning Angel (yawning at torproject dot org) \n All rights reserved.</string> <string name="shapeshifter_dispatcher" translatable="false">Shapeshifter Dispatcher</string> <string name="copyright_shapeshifter_dispatcher" translatable="false">Copyright (c) 2014, Yawning Angel (yawning at torproject dot org) \n All rights reserved.</string> + <string name="circleImageView" translatable="false">CircleImageView</string> + <string name="copyright_circleImageView" translatable="false">Copyright 2014 - 2020 Henning Dodenhof. Licensed under the Apache License, Version 2.0 </string> + </resources> |
