commit 4fd494981370e5d6bd85d086b58daa9736a33833 Author: Harald Hoyer Date: Thu Jul 31 07:35:47 2014 +0200 initial checkin diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..afbdab3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..cb6ae5d --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +SecretShare \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..e206d70 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..736c7b5 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..92d833e --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + + Android API 19 Platform + + + + + + + + Android API 10 Platform + + + + + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..05a4c18 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..275077f --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/SecretShare.iml b/SecretShare.iml new file mode 100644 index 0000000..0bb6048 --- /dev/null +++ b/SecretShare.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/app.iml b/app/app.iml new file mode 100644 index 0000000..db56791 --- /dev/null +++ b/app/app.iml @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..cbc6afa --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,46 @@ +apply plugin: 'com.android.application' + +apply plugin: 'maven' + +dependencies { + compile 'com.tiemens:secretshare:1.4.1' + compile 'com.google.zxing:core:3.1.0' +} + +buildscript { + repositories { + mavenCentral() + } + dependencies { + classpath 'com.android.tools.build:gradle:0.12.1' + } +} + +allprojects { + repositories { + mavenCentral() + } +} + +android { + compileSdkVersion 20 + buildToolsVersion "20.0.0" + + defaultConfig { + applicationId "org.surfsite.android.secretshare" + minSdkVersion 15 + targetSdkVersion 20 + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + runProguard false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..bb65c6f --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /Applications/Android Studio.app/sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/app/src/androidTest/java/org/surfsite/android/secretshare/ApplicationTest.java b/app/src/androidTest/java/org/surfsite/android/secretshare/ApplicationTest.java new file mode 100644 index 0000000..f74a78b --- /dev/null +++ b/app/src/androidTest/java/org/surfsite/android/secretshare/ApplicationTest.java @@ -0,0 +1,13 @@ +package org.surfsite.android.secretshare; + +import android.app.Application; +import android.test.ApplicationTestCase; + +/** + * Testing Fundamentals + */ +public class ApplicationTest extends ApplicationTestCase { + public ApplicationTest() { + super(Application.class); + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..1013d47 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,22 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/java/org/surfsite/android/secretshare/FragmentSupport.java b/app/src/main/java/org/surfsite/android/secretshare/FragmentSupport.java new file mode 100644 index 0000000..1794039 --- /dev/null +++ b/app/src/main/java/org/surfsite/android/secretshare/FragmentSupport.java @@ -0,0 +1,5 @@ +package org.surfsite.android.secretshare; + +public interface FragmentSupport { + boolean mayBackPress(); +} diff --git a/app/src/main/java/org/surfsite/android/secretshare/GenerateFragment.java b/app/src/main/java/org/surfsite/android/secretshare/GenerateFragment.java new file mode 100644 index 0000000..270dd86 --- /dev/null +++ b/app/src/main/java/org/surfsite/android/secretshare/GenerateFragment.java @@ -0,0 +1,288 @@ +package org.surfsite.android.secretshare; + +import android.app.Activity; +import android.app.Fragment; +import android.graphics.Bitmap; +import android.graphics.Color; +import android.net.Uri; +import android.os.AsyncTask; +import android.os.Bundle; +import android.util.Base64; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import com.google.zxing.BarcodeFormat; +import com.google.zxing.EncodeHintType; +import com.google.zxing.WriterException; +import com.google.zxing.common.BitMatrix; +import com.google.zxing.qrcode.QRCodeWriter; +import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; +import com.tiemens.secretshare.engine.SecretShare; +import com.tiemens.secretshare.engine.SecretShare.ShareInfo; + +import java.io.UnsupportedEncodingException; +import java.math.BigInteger; +import java.nio.ByteBuffer; +import java.util.Hashtable; +import java.util.List; + + +/** + * A simple {@link Fragment} subclass. + * Activities that contain this fragment must implement the + * {@link GenerateFragment.OnFragmentInteractionListener} interface + * to handle interaction events. + * Use the {@link GenerateFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class GenerateFragment extends Fragment implements FragmentSupport { + private static final String ARG_N = "n"; + private static final String ARG_K = "k"; + private static final String ARG_CLEARTEXT = "cleartext"; + private final static QRCodeWriter sQRCodeWriter = new QRCodeWriter(); + private int n; + private int k; + private String cleartext; + private GenerateSharesTask generateSharesTask = null; + private OnFragmentInteractionListener mListener; + + public GenerateFragment() { + // Required empty public constructor + } + + /** + * Use this factory method to create a new instance of + * this fragment using the provided parameters. + * + * @param n number of secrets. + * @param k number of needed secrets. + * @param cleartext text to split. + * @return A new instance of fragment GenerateFragment. + */ + public static GenerateFragment newInstance(int n, int k, String cleartext) { + GenerateFragment fragment = new GenerateFragment(); + Bundle args = new Bundle(); + args.putInt(ARG_K, k); + args.putInt(ARG_N, n); + args.putString(ARG_CLEARTEXT, cleartext); + fragment.setArguments(args); + return fragment; + } + + static BigInteger stringToBigInteger(String in) { + BigInteger bigint; + try { + bigint = new BigInteger(in.getBytes("UTF-8")); + } catch (UnsupportedEncodingException ex) { + ex.printStackTrace(); + bigint = BigInteger.ZERO; + } + return bigint; + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + if (getArguments() != null) { + n = getArguments().getInt(ARG_N); + k = getArguments().getInt(ARG_K); + cleartext = getArguments().getString(ARG_CLEARTEXT); + } + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + View rootView = inflater.inflate(R.layout.fragment_generate, container, false); + return rootView; + } + + public void onButtonPressed(Uri uri) { + if (mListener != null) { + mListener.onFragmentInteraction(uri); + } + } + + @Override + public void onAttach(Activity activity) { + super.onAttach(activity); + try { + mListener = (OnFragmentInteractionListener) activity; + } catch (ClassCastException e) { + throw new ClassCastException(activity.toString() + + " must implement OnFragmentInteractionListener"); + } + } + + @Override + public void onDetach() { + super.onDetach(); + mListener = null; + } + + @Override + public void onStart() { + super.onStart(); + if (generateSharesTask != null) + generateSharesTask.cancel(true); + + TextView tv = (TextView) getActivity().findViewById(R.id.generate_status); + + generateSharesTask = new GenerateSharesTask(tv, n, k, cleartext); + generateSharesTask.execute(); + } + + @Override + public void onStop() { + if (generateSharesTask != null) + generateSharesTask.cancel(false); + generateSharesTask = null; + super.onStop(); + } + + public boolean mayBackPress() { + if (generateSharesTask != null) { + return generateSharesTask.isFinished(); + +// generateSharesTask.cancel(false); +// generateSharesTask = null; + } + return true; + } + + /** + * This interface must be implemented by activities that contain this + * fragment to allow an interaction in this fragment to be communicated + * to the activity and potentially other fragments contained in that + * activity. + *

+ * See the Android Training lesson Communicating with Other Fragments for more information. + */ + public interface OnFragmentInteractionListener { + public void onFragmentInteraction(Uri uri); + } + + private class GenerateSharesTask extends AsyncTask { + private TextView tv; + private List pieces; + private int n; + private int k; + private String cleartext; + private SecretShare.PublicInfo publicInfo; + private boolean finished = false; + + public GenerateSharesTask(TextView tv, int n, int k, String cleartext) { + this.tv = tv; + this.n = n; + this.k = k; + this.cleartext = cleartext; + this.tv.setText("Generating shared secrets for " + cleartext.length() + + " chars. Please Wait. This can take a long time."); + } + + private Bitmap createBitmap(byte[] content, final int size) { + final Hashtable hints = + new Hashtable(); + hints.put(EncodeHintType.ERROR_CORRECTION, ErrorCorrectionLevel.M); + hints.put(EncodeHintType.CHARACTER_SET, "ISO-8859-1"); + BitMatrix result; + + String data; + try { + data = new String(content, "ISO-8859-1"); + } catch (Exception ex) { + ex.printStackTrace(); + data = new String(content); + } + + try { + result = sQRCodeWriter.encode(data, + BarcodeFormat.QR_CODE, + size, + size, + hints); + } catch (WriterException ex) { + return null; + } + + final int width = result.getWidth(); + final int height = result.getHeight(); + final int[] pixels = new int[width * height]; + + for (int y = 0; y < height; y++) { + final int offset = y * width; + for (int x = 0; x < width; x++) { + pixels[offset + x] = + result.get(x, y) ? Color.BLACK : Color.TRANSPARENT; + } + } + + final Bitmap bitmap = + Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888); + bitmap.setPixels(pixels, 0, width, 0, 0, width, height); + + return bitmap; + } + + public boolean isFinished() { + return finished; + } + + @Override + protected Void doInBackground(Void... params) { + final BigInteger secretInteger = stringToBigInteger(cleartext); + final BigInteger modulus; + + modulus = SecretShare.createAppropriateModulusForSecret(secretInteger); + publicInfo = new SecretShare.PublicInfo(n, + k, + modulus, + null); + final SecretShare.SplitSecretOutput splitSecretOutput = new SecretShare(publicInfo) + .split(secretInteger); + pieces = splitSecretOutput.getShareInfos(); + return null; + } + + @Override + protected void onPostExecute(Void nothing) { + super.onPostExecute(nothing); + String[] out = new String[pieces.size()]; + tv.setText(""); + for (int i = 0; i < out.length; i++) { + final ShareInfo piece = pieces.get(i); + + byte[] bmodulus = publicInfo.getPrimeModulus().toByteArray(); + byte[] bshare = piece.getShare().toByteArray(); + int blen = 4 + 4 + 4 + 4 + 4 + bmodulus.length + bshare.length; + ByteBuffer bencoded = ByteBuffer.allocate(blen); + bencoded.putInt(n).putInt(k).putInt(piece.getX()); + bencoded.putInt(bmodulus.length).put(bmodulus); + bencoded.putInt(bshare.length).put(bshare); + + tv.append("Length: " + blen + "\n"); + + out[i] = n + ":" + k + ":" + piece.getX() + ":" + + publicInfo.getPrimeModulus() + ":" + piece.getShare(); + + tv.append("OutLen: " + out[i].length() + "\n"); + tv.append(out[i] + "\n"); + tv.append(bencoded + "\n0x"); + for (byte b : bencoded.array()) { + tv.append(String.format("%x", b)); + } + tv.append("\n"); + String bencoded64 = Base64.encodeToString(bencoded.array(), Base64.DEFAULT); + tv.append("B64Len: " + bencoded64.length() + "\n"); + tv.append(bencoded64 + "\n"); + tv.append(bencoded + "\n\n"); + } + this.finished = true; + } + } +} diff --git a/app/src/main/java/org/surfsite/android/secretshare/InputFragment.java b/app/src/main/java/org/surfsite/android/secretshare/InputFragment.java new file mode 100644 index 0000000..c0fe23e --- /dev/null +++ b/app/src/main/java/org/surfsite/android/secretshare/InputFragment.java @@ -0,0 +1,156 @@ +package org.surfsite.android.secretshare; + +import android.app.Activity; +import android.app.Fragment; +import android.content.Context; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.view.inputmethod.InputMethodManager; +import android.widget.Button; +import android.widget.EditText; + + +/** + * A simple {@link Fragment} subclass. + * Activities that contain this fragment must implement the + * {@link org.surfsite.android.secretshare.InputFragment.OnInputFragmentInteractionListener} interface + * to handle interaction events. + * Use the {@link InputFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class InputFragment extends Fragment { + private static final String ARG_N = "n"; + private static final String ARG_K = "k"; + private static final String ARG_CLEARTEXT = "cleartext"; + private OnInputFragmentInteractionListener mListener; + private int n = 3; + private int k = 2; + private String cleartext; + + public InputFragment() { + // Required empty public constructor + } + + /** + * Use this factory method to create a new instance of + * this fragment using the provided parameters. + * + * @return A new instance of fragment InputFragment. + */ + public static InputFragment newInstance(int n, int k, String cleartext) { + InputFragment fragment = new InputFragment(); + Bundle args = new Bundle(); + args.putInt(ARG_K, k); + args.putInt(ARG_N, n); + args.putString(ARG_CLEARTEXT, cleartext); + fragment.setArguments(args); + return fragment; + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + if (getArguments() != null) { + n = getArguments().getInt(ARG_N); + k = getArguments().getInt(ARG_K); + cleartext = getArguments().getString(ARG_CLEARTEXT); + } + } + + @Override + public void onSaveInstanceState(Bundle args) { + args.putInt(ARG_K, k); + args.putInt(ARG_N, n); + args.putString(ARG_CLEARTEXT, cleartext); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + View rootView = inflater.inflate(R.layout.fragment_input, container, false); + final Button generateButton = (Button) rootView.findViewById(R.id.generate_button); + assert (generateButton != null); + generateButton.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + onGenerateButtonPressed(); + } + }); + final EditText clearEditText = (EditText) rootView.findViewById(R.id.clearEditText); + clearEditText.setText(cleartext); + + //set on focus to force keyboard + clearEditText.setOnFocusChangeListener(new View.OnFocusChangeListener() { + @Override + public void onFocusChange(View v, boolean hasFocus) { + if (hasFocus) { + //open keyboard + ((InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE)).showSoftInput(v, + InputMethodManager.SHOW_FORCED); + } else { + //close keyboard + ((InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE)).hideSoftInputFromWindow( + v.getWindowToken(), 0); + } + } + }); + + //Set on click listener to clear focus + clearEditText.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View clickedView) { + clickedView.clearFocus(); + clickedView.requestFocus(); + } + }); + + return rootView; + } + + public void onGenerateButtonPressed() { + if (mListener != null) { + final EditText clearEditText = (EditText) getActivity().findViewById(R.id.clearEditText); + + cleartext = clearEditText.getText().toString(); + if (cleartext.isEmpty()) + return; + + mListener.generateSecret(n, k, cleartext); + } + } + + @Override + public void onAttach(Activity activity) { + super.onAttach(activity); + try { + mListener = (OnInputFragmentInteractionListener) activity; + } catch (ClassCastException e) { + throw new ClassCastException(activity.toString() + + " must implement OnInputFragmentInteractionListener"); + } + } + + @Override + public void onDetach() { + super.onDetach(); + mListener = null; + } + + /** + * This interface must be implemented by activities that contain this + * fragment to allow an interaction in this fragment to be communicated + * to the activity and potentially other fragments contained in that + * activity. + *

+ * See the Android Training lesson Communicating with Other Fragments for more information. + */ + public interface OnInputFragmentInteractionListener { + public void generateSecret(int n, int k, String cleartext); + } + +} diff --git a/app/src/main/java/org/surfsite/android/secretshare/LinuxSecureRandom.java b/app/src/main/java/org/surfsite/android/secretshare/LinuxSecureRandom.java new file mode 100644 index 0000000..a1b6cde --- /dev/null +++ b/app/src/main/java/org/surfsite/android/secretshare/LinuxSecureRandom.java @@ -0,0 +1,86 @@ +package org.surfsite.android.secretshare; +/** + * Copyright 2013 Google Inc. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +import java.io.DataInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.security.Provider; +import java.security.SecureRandomSpi; +import java.security.Security; + +/** + * A SecureRandom implementation that is able to override the standard JVM provided implementation, and which simply + * serves random numbers by reading /dev/urandom. That is, it delegates to the kernel on UNIX systems and is unusable on + * other platforms. Attempts to manually set the seed are ignored. There is no difference between seed bytes and + * non-seed bytes, they are all from the same source. + */ +public class LinuxSecureRandom extends SecureRandomSpi { + private static final FileInputStream urandom; + private final DataInputStream dis; + + public LinuxSecureRandom() { + // DataInputStream is not thread safe, so each random object has its own. + dis = new DataInputStream(urandom); + } + + @Override + protected void engineSetSeed(byte[] bytes) { + // Ignore. + } + + @Override + protected void engineNextBytes(byte[] bytes) { + try { + dis.readFully(bytes); // This will block until all the bytes can be read. + } catch (IOException e) { + throw new RuntimeException(e); // Fatal error. Do not attempt to recover from this. + } + } + + @Override + protected byte[] engineGenerateSeed(int i) { + byte[] bits = new byte[i]; + engineNextBytes(bits); + return bits; + } + + private static class LinuxSecureRandomProvider extends Provider { + public LinuxSecureRandomProvider() { + super("LinuxSecureRandom", 1.0, "A Linux specific random number provider that uses /dev/urandom"); + put("SecureRandom.LinuxSecureRandom", LinuxSecureRandom.class.getName()); + } + } + + static { + try { + File file = new File("/dev/urandom"); + if (file.exists()) { + // This stream is deliberately leaked. + urandom = new FileInputStream(file); + // Now override the default SecureRandom implementation with this one. + Security.insertProviderAt(new LinuxSecureRandomProvider(), 1); + } else { + urandom = null; + } + } catch (FileNotFoundException e) { + // Should never happen. + throw new RuntimeException(e); + } + } +} diff --git a/app/src/main/java/org/surfsite/android/secretshare/MainActivity.java b/app/src/main/java/org/surfsite/android/secretshare/MainActivity.java new file mode 100644 index 0000000..6c12cce --- /dev/null +++ b/app/src/main/java/org/surfsite/android/secretshare/MainActivity.java @@ -0,0 +1,77 @@ +package org.surfsite.android.secretshare; + +import android.app.Activity; +import android.app.Fragment; +import android.app.FragmentTransaction; +import android.net.Uri; +import android.os.Bundle; +import android.view.Menu; +import android.view.MenuItem; + + +public class MainActivity extends Activity + implements + GenerateFragment.OnFragmentInteractionListener, + InputFragment.OnInputFragmentInteractionListener { + + @Override + protected void onCreate(Bundle savedInstanceState) { + new LinuxSecureRandom(); // init proper random number generator + + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + if (savedInstanceState == null) { + FragmentTransaction transaction = getFragmentManager().beginTransaction(); + transaction.add(R.id.container, new InputFragment()); + //transaction.addToBackStack(null); + transaction.commit(); + } + // QRCODE + // IntentIntegrator test; + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + // Inflate the menu; this adds items to the action bar if it is present. + getMenuInflater().inflate(R.menu.main, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + // Handle action bar item clicks here. The action bar will + // automatically handle clicks on the Home/Up button, so long + // as you specify a parent activity in AndroidManifest.xml. + int id = item.getItemId(); + if (id == R.id.action_settings) { + return true; + } + return super.onOptionsItemSelected(item); + } + + public void generateSecret(int n, int k, String cleartext) { + Fragment generateFragment = new GenerateFragment().newInstance(n, k, cleartext); + FragmentTransaction transaction = getFragmentManager().beginTransaction(); + transaction.replace(R.id.container, generateFragment, "GENERATEFRAGMENT"); + transaction.addToBackStack(null); + transaction.commit(); + } + + public void onFragmentInteraction(Uri uri) { + } + + + @Override + public void onBackPressed() { + try { + final FragmentSupport fragment = (FragmentSupport) getFragmentManager().findFragmentByTag("GENERATEFRAGMENT"); + + if (fragment == null || fragment.mayBackPress()) { + super.onBackPressed(); + } + } catch (ClassCastException e) { + super.onBackPressed(); + } + + } +} diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 0000000..96a442e Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 0000000..359047d Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png new file mode 100644 index 0000000..71c6d76 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..4df1894 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..284df17 --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,8 @@ + diff --git a/app/src/main/res/layout/fragment_generate.xml b/app/src/main/res/layout/fragment_generate.xml new file mode 100644 index 0000000..ad14c2d --- /dev/null +++ b/app/src/main/res/layout/fragment_generate.xml @@ -0,0 +1,23 @@ + + + + + + + + diff --git a/app/src/main/res/layout/fragment_input.xml b/app/src/main/res/layout/fragment_input.xml new file mode 100644 index 0000000..c15f983 --- /dev/null +++ b/app/src/main/res/layout/fragment_input.xml @@ -0,0 +1,42 @@ + + + + + + + +