diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java index d9328890b..840f29bae 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/MainActivity.java @@ -20,6 +20,8 @@ package org.sufficientlysecure.keychain.ui; import android.content.Intent; +import android.os.Build; +import android.os.Build.VERSION_CODES; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; @@ -42,6 +44,7 @@ import org.sufficientlysecure.keychain.operations.results.OperationResult; import org.sufficientlysecure.keychain.remote.ui.AppsListFragment; import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenActivity; import org.sufficientlysecure.keychain.ui.transfer.view.TransferFragment; +import org.sufficientlysecure.keychain.ui.transfer.view.TransferNotAvailableFragment; import org.sufficientlysecure.keychain.util.FabContainer; import org.sufficientlysecure.keychain.util.Preferences; @@ -176,7 +179,6 @@ public class MainActivity extends BaseSecurityTokenActivity implements FabContai } private void setFragment(Fragment fragment, boolean addToBackStack) { - FragmentManager fragmentManager = getSupportFragmentManager(); fragmentManager.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE); @@ -221,8 +223,13 @@ public class MainActivity extends BaseSecurityTokenActivity implements FabContai private void onTransferSelected() { mToolbar.setTitle(R.string.nav_transfer); mDrawer.setSelection(ID_TRANSFER, false); - Fragment frag = new TransferFragment(); - setFragment(frag, true); + if (Build.VERSION.SDK_INT < VERSION_CODES.LOLLIPOP) { + Fragment frag = new TransferNotAvailableFragment(); + setFragment(frag, true); + } else { + Fragment frag = new TransferFragment(); + setFragment(frag, true); + } } @Override diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/view/TransferNotAvailableFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/view/TransferNotAvailableFragment.java new file mode 100644 index 000000000..25e0058fd --- /dev/null +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/transfer/view/TransferNotAvailableFragment.java @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2017 Vincent Breitmoser + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package org.sufficientlysecure.keychain.ui.transfer.view; + + +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import org.sufficientlysecure.keychain.R; + + +public class TransferNotAvailableFragment extends Fragment { + @Override + public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + return inflater.inflate(R.layout.transfer_not_available_fragment, container, false); + } +} diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_android_96dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_android_96dp.png new file mode 100644 index 000000000..e5c94abed Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-hdpi/ic_android_96dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_android_96dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_android_96dp.png new file mode 100644 index 000000000..376485ca1 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-mdpi/ic_android_96dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_android_96dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_android_96dp.png new file mode 100644 index 000000000..d423e1ed1 Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xhdpi/ic_android_96dp.png differ diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_android_96dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_android_96dp.png new file mode 100644 index 000000000..a7071a8aa Binary files /dev/null and b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_android_96dp.png differ diff --git a/OpenKeychain/src/main/res/layout/transfer_not_available_fragment.xml b/OpenKeychain/src/main/res/layout/transfer_not_available_fragment.xml new file mode 100644 index 000000000..ddac3005c --- /dev/null +++ b/OpenKeychain/src/main/res/layout/transfer_not_available_fragment.xml @@ -0,0 +1,27 @@ + + + + + + + + diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 7c34fcb88..2d52ddbdb 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1901,5 +1901,6 @@ "Failed reading incoming key!" "Connection failed!" "Error waiting for connection!" + "Sorry, this feature can only be used on Android 5 or newer :(" diff --git a/graphics/drawables/ic_android.svg b/graphics/drawables/ic_android.svg new file mode 100644 index 000000000..b3ee9b114 --- /dev/null +++ b/graphics/drawables/ic_android.svg @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/graphics/update-drawables.sh b/graphics/update-drawables.sh index f377a00b0..a0954c8cd 100755 --- a/graphics/update-drawables.sh +++ b/graphics/update-drawables.sh @@ -32,7 +32,7 @@ inkscape -w 72 -h 72 -e "$XXDPI_DIR/${NAME}_24dp.png" "$SRC_DIR/$NAME.svg" inkscape -w 96 -h 96 -e "$XXXDPI_DIR/${NAME}_24dp.png" "$SRC_DIR/$NAME.svg" done -for NAME in "ic_wifi_off" "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" "status_signature_verified_inner" +for NAME in "ic_android" "ic_wifi_off" "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" "status_signature_verified_inner" do echo $NAME inkscape -w 96 -h 96 -e "$MDPI_DIR/${NAME}_96dp.png" "$SRC_DIR/$NAME.svg"