Relicensing from Apache License v2 to GPLv3+. This is only done on classes that (have copyright by Dominik Schürmann or Markus Doits) or (are completly refactored by me and contain no remaining code by Thialfihar). Code by Thialfihar (not reachable by mail) and Shaun Senecal (disagreed on license change) remain Apache License v2.

This commit is contained in:
Dominik Schürmann
2013-09-06 16:17:01 +02:00
parent a0b0eeaf87
commit 4e378a0a33
50 changed files with 565 additions and 433 deletions

View File

@@ -18,14 +18,8 @@
package org.sufficientlysecure.keychain.ui;
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.Id;
import org.sufficientlysecure.keychain.R;
import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockFragmentActivity;
import com.actionbarsherlock.view.Menu;
import com.actionbarsherlock.view.MenuItem;
import android.content.Intent;
import android.os.Bundle;
import android.view.LayoutInflater;
@@ -33,6 +27,9 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
import com.actionbarsherlock.app.ActionBar;
import com.actionbarsherlock.app.SherlockFragmentActivity;
public class SelectPublicKeyActivity extends SherlockFragmentActivity {
// Not used in sourcode, but listed in AndroidManifest!