Remove about activity and fix dht details

markwinter · May 26, 2014 · 97d806c · 97d806c
1 parent 18c5905
commit 97d806c
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 190 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -65,15 +65,6 @@
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="im.tox.antox.activities.MainActivity" />
         </activity>
-        <activity
-            android:name="im.tox.antox.activities.AboutActivity"
-            android:label="@string/title_activity_about"
-
-            android:parentActivityName="im.tox.antox.activities.MainActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="im.tox.antox.activities.MainActivity" />
-        </activity>
         <activity
             android:name="im.tox.antox.activities.WelcomeActivity"
 

diff --git a/app/src/main/java/im/tox/antox/activities/AboutActivity.java b/app/src/main/java/im/tox/antox/activities/AboutActivity.java
diff --git a/app/src/main/java/im/tox/antox/activities/MainActivity.java b/app/src/main/java/im/tox/antox/activities/MainActivity.java
@@ -682,15 +682,6 @@ private void openProfile() {
         Intent intent = new Intent(this, ProfileActivity.class);
         startActivity(intent);
     }
-    /**
-     * Starts a new intent to open the AboutActivity class
-     *
-     * @see im.tox.antox.activities.AboutActivity
-     */
-    private void openAbout() {
-        Intent intent = new Intent(this, AboutActivity.class);
-        startActivity(intent);
-    }
     /**
      * Starts a new intent to open the AddFriendActivity class
      *
@@ -759,9 +750,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
             case R.id.action_manage_group:
                 openGroupManagement();
                 return true;
-            case R.id.action_about:
-                openAbout();
-                return true;
             case R.id.add_friend:
                 addFriend();
                 return true;

diff --git a/app/src/main/java/im/tox/antox/utils/DHTNodeDetails.java b/app/src/main/java/im/tox/antox/utils/DHTNodeDetails.java
@@ -111,7 +111,7 @@ protected Void doInBackground(Void... params) {
                 DhtNode.location.add("FR");
                 DhtNode.owner.add("mouseym");
                 DhtNode.port.add("33445");
-                DhtNode.key.add("C021232F9AC83914A45DFCF242129B216FED5ED34683F385D932A66BC9178270");
+                DhtNode.key.add("A9D98212B3F972BD11DA52BEB0658C326FCCC1BFD49F347F9C2D3D8B61E1B927");
 
                 DhtNode.ipv4.add("109.169.46.133");
                 DhtNode.ipv6.add("");
@@ -126,13 +126,6 @@ protected Void doInBackground(Void... params) {
                 DhtNode.owner.add("aitjcize");
                 DhtNode.port.add("33445");
                 DhtNode.key.add("7F9C31FE850E97CEFD4C4591DF93FC757C7C12549DDD55F8EEAECC34FE76C029");
-
-                DhtNode.ipv4.add("31.192.105.19");
-                DhtNode.ipv6.add("");
-                DhtNode.location.add("RU");
-                DhtNode.owner.add("zlacki");
-                DhtNode.port.add("33445");
-                DhtNode.key.add("D59F99384592DE4C8AB9D534D5197DB90F4755CC9E975ED0C565E18468A1445B");
             }
         }
 

diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
diff --git a/app/src/main/res/menu/about.xml b/app/src/main/res/menu/about.xml
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
@@ -36,13 +36,6 @@
         antonx:showAsAction="never"
         android:title="@string/action_profile"/>
 
-    <item
-        android:id="@+id/action_about"
-        android:orderInCategory="99"
-        android:showAsAction="never"
-        antonx:showAsAction="never"
-        android:title="@string/action_about"/>
-
     <item
         android:id="@+id/search_friend"
         android:orderInCategory="25"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -39,15 +39,6 @@
     </string>
     <string name="main_node_list_download_error">Error Downloading Nodes List</string>
 
-    <!-- About Activity -->
-    <string name="about_details">Antox is an Android client for Tox</string>
-    <string name="about_bugs">To report a bug, please visit our GitHub page and click on \"issues\".</string>
-    <string name="about_github_url">https://github.com/Astonex/Antox</string>
-    <string name="about_facebook_url">https://www.facebook.com/toxproject</string>
-    <string name="about_twitter_url">https://twitter.com/ProjectTox</string>
-    <string name="about_irc">We\'re on Freenode on #tox-dev</string>
-    <string name="about_version">Version</string>
-
     <!--  Chat Activity -->
     <string name="chat_enter_message">Send a message</string>