Skip to content

Commit

Permalink
Revert "fixed PurpleI2P#1088"
Browse files Browse the repository at this point in the history
  • Loading branch information
orignal authored Feb 7, 2018
1 parent 6bb7382 commit ae3fca1
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 190 deletions.
10 changes: 5 additions & 5 deletions android/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@
android:versionName="2.18.0">
<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="25"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.INTERNET"/><!-- normal perm, per https://developer.android.com/guide/topics/permissions/normal-permissions.html -->
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/><!-- normal perm -->
<application android:label="@string/app_name" android:allowBackup="true" android:icon="@drawable/icon" android:theme="@style/Theme.AppCompat">
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<application android:label="@string/app_name" android:allowBackup="true" android:icon="@drawable/icon" >
<receiver android:name=".NetworkStateChangeReceiver">
<intent-filter>
<action android:name="android.net.conn.CONNECTIVITY_CHANGE"/>
</intent-filter>
</receiver>
<activity android:name=".I2PDPermsAskerActivity" android:label="@string/app_name">
<activity android:name=".I2PDActivity"
android:label="@string/app_name">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<activity android:name=".I2PDActivity" android:label="@string/app_name"/>
<service android:enabled="true" android:name=".ForegroundService"/>
</application>
</manifest>
22 changes: 3 additions & 19 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,31 +1,15 @@
buildscript {
repositories {
mavenCentral()
jcenter()
mavenCentral()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.3.3'
classpath 'com.android.tools.build:gradle:2.3.3'
}
}

apply plugin: 'com.android.application'

repositories {
jcenter()
maven {
url 'https://maven.google.com'
}
}

dependencies {
// compile "com.android.support:support-v4:26.1.0"
// compile "com.android.support:support-v13:26.1.0"
// compile "com.android.support:cardview-v7:26.1.0"
// compile "com.android.support:appcompat-v7:26.1.0"
compile 'com.android.support:support-v4:25.3.1'
compile 'com.android.support:design:25.3.1'
}

android {
compileSdkVersion 25
buildToolsVersion "25.0.2"
Expand Down
27 changes: 0 additions & 27 deletions android/res/layout/activity_perms_asker.xml

This file was deleted.

16 changes: 0 additions & 16 deletions android/res/values/template-dimens.xml

This file was deleted.

3 changes: 1 addition & 2 deletions android/src/org/purplei2p/i2pd/I2PDActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,13 @@
import android.content.ServiceConnection;
import android.os.Bundle;
import android.os.IBinder;
import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.TextView;
import android.widget.Toast;

public class I2PDActivity extends AppCompatActivity {
public class I2PDActivity extends Activity {
private static final String TAG = "i2pdActvt";
public static final int GRACEFUL_DELAY_MILLIS = 10 * 60 * 1000;

Expand Down
121 changes: 0 additions & 121 deletions android/src/org/purplei2p/i2pd/I2PDPermsAskerActivity.java

This file was deleted.

0 comments on commit ae3fca1

Please sign in to comment.